v2: fix inverted fas_staging_url/fas_url --- roles/fas_client/defaults/main.yml | 8 ++++++++ roles/fas_client/templates/fas.conf.j2 | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 roles/fas_client/defaults/main.yml diff --git a/roles/fas_client/defaults/main.yml b/roles/fas_client/defaults/main.yml new file mode 100644 index 0000000..f0983d2 --- /dev/null +++ b/roles/fas_client/defaults/main.yml @@ -0,0 +1,8 @@ +--- +# defaults file for fas_client +# + +fas_url: https://admin.fedoraproject.org/accounts/ +fas_staging_url: https://admin.stg.fedoraproject.org/accounts/ +fas_home: /home/fedora +fas_home_backup_dir: "{{ fas_home }}.bak" diff --git a/roles/fas_client/templates/fas.conf.j2 b/roles/fas_client/templates/fas.conf.j2 index a27f0ef..2824339 100644 --- a/roles/fas_client/templates/fas.conf.j2 +++ b/roles/fas_client/templates/fas.conf.j2 @@ -1,9 +1,9 @@ [global] ; url - Location to fas server {% if env == "staging" %} -url = https://admin.stg.fedoraproject.org/accounts/ +url = {{ fas_staging_url }} {% else %} -url = https://admin.fedoraproject.org/accounts/ +url = {{ fas_url }} {% endif %} ; temp - Location to generate files while user creation process is happening @@ -59,11 +59,11 @@ aliases_template = /etc/aliases.template shell = /bin/bash ; home - the location for fas user home dirs -home = /home/fedora +home = {{ fas_home }} ; home_backup_dir - Location home dirs should get moved to when a user is ; deleted this location should be tmpwatched -home_backup_dir = /home/fedora.bak +home_backup_dir = {{ fas_home_backup_dir }} ; ssh_restricted_app - This is the path to the restricted shell script. It ; will not work automatically for most people though through alterations it -- 1.7.2.1 _______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx http://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
