From 48e2a3d6d7b80241e6b52fe82dfd1d7f1e7b9c32 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 23 Jan 2015 17:57:10 +0100 Subject: [PATCH] Move back the variables to what they should be fasClient was failing as it could not put the username in places. At first I thought this was an issue related to the first time we run fasClient and I thus introduced a way-around by making the first run be w/o the use of these variables and later in the role, add a new fas.conf template that would use these variables. It turned out that the problem was coming from fasClient itself (change merged upstream but not deployed) so all my efforts were useless. Reverting all things back to their original state and we'll just look into fixing fasClient properly. --- inventory/group_vars/pkgs-stg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs-stg index 7316dadb0a..b7cc3f742b 100644 --- a/inventory/group_vars/pkgs-stg +++ b/inventory/group_vars/pkgs-stg @@ -9,8 +9,8 @@ tcp_ports: [80, 443, 9418, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] fas_client_groups: sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc -fas_client_restricted_app_2: HOME=/srv/git /usr/share/gitolite3/gitolite-shell %(username)s -fas_client_admin_app_2: HOME=/srv/git /usr/share/gitolite3/gitolite-shell -s %(username)s +fas_client_restricted_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell %(username)s +fas_client_admin_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell -s %(username)s fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc" admin_groups: "@sysadmin-cvs @sysadmin-build @sysadmin-noc"