From 346463c7e7d58ec041da45ef33cfdde9d93cee49 Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Thu, 17 Mar 2016 12:21:23 +0100 Subject: [PATCH 1/7] set user and group of user dir in pillar --- users/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/init.sls b/users/init.sls index ca44a40..5cba77d 100644 --- a/users/init.sls +++ b/users/init.sls @@ -59,8 +59,8 @@ users_{{ name }}_user: {% if user.get('createhome', True) %} file.directory: - name: {{ home }} - - user: {{ name }} - - group: {{ user_group }} + - user: {{ user.get('user_dir_user', name) }} + - group: {{ user.get('user_dir_group', user_group) }} - mode: {{ user.get('user_dir_mode', '0750') }} - require: - user: users_{{ name }}_user From fa02b954a518dd0c356a34136db654982799cf24 Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Thu, 17 Mar 2016 12:21:23 +0100 Subject: [PATCH 2/7] set user and group of user dir in pillar --- users/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/init.sls b/users/init.sls index 03c9cf3..bfe88aa 100644 --- a/users/init.sls +++ b/users/init.sls @@ -59,8 +59,8 @@ users_{{ name }}_user: {% if user.get('createhome', True) %} file.directory: - name: {{ home }} - - user: {{ name }} - - group: {{ user_group }} + - user: {{ user.get('user_dir_user', name) }} + - group: {{ user.get('user_dir_group', user_group) }} - mode: {{ user.get('user_dir_mode', '0750') }} - require: - user: users_{{ name }}_user From c735c6e915f668361cc5cf7e27e3c20bfe3486bd Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Mon, 13 Jun 2016 17:22:09 +0200 Subject: [PATCH 3/7] add pillar data --- pillar.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pillar.example b/pillar.example index e88ee3d..4e55a7c 100644 --- a/pillar.example +++ b/pillar.example @@ -12,6 +12,8 @@ users: # will be ignored by enabling password-less login for the user. empty_password: False home: /custom/buser + homedir_owner: buser + homedir_group: primarygroup createhome: True roomnumber: "A-1" workphone: "(555) 555-5555" From c9fecc1d9653da89301bd6fcbc20227fba394a43 Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Mon, 13 Jun 2016 17:22:24 +0200 Subject: [PATCH 4/7] renamed variables --- users/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/init.sls b/users/init.sls index bfe88aa..3bc45ad 100644 --- a/users/init.sls +++ b/users/init.sls @@ -59,8 +59,8 @@ users_{{ name }}_user: {% if user.get('createhome', True) %} file.directory: - name: {{ home }} - - user: {{ user.get('user_dir_user', name) }} - - group: {{ user.get('user_dir_group', user_group) }} + - user: {{ user.get('homedir_owner', name) }} + - group: {{ user.get('homedir_group', user_group) }} - mode: {{ user.get('user_dir_mode', '0750') }} - require: - user: users_{{ name }}_user From 0d7ca5728ca3dd0b27835b5ef273345b051db834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20N=C3=BCssle?= Date: Wed, 30 Nov 2016 16:33:38 +0100 Subject: [PATCH 5/7] fix wrong variable name in absent_users --- users/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/init.sls b/users/init.sls index 15c40d4..83eabaf 100644 --- a/users/init.sls +++ b/users/init.sls @@ -479,7 +479,7 @@ users_{{ users.sudoers_dir }}/{{ name }}: {% for user in pillar.get('absent_users', []) %} users_absent_user_2_{{ user }}: user.absent: - - name: {{ name }} + - name: {{ user }} users_2_{{ users.sudoers_dir }}/{{ user }}: file.absent: - name: {{ users.sudoers_dir }}/{{ user }} From 153d07452c6a379ea3ca81038926429b703845c8 Mon Sep 17 00:00:00 2001 From: Fabian Niepelt Date: Thu, 1 Dec 2016 16:59:51 +0100 Subject: [PATCH 6/7] Add support for hash_password --- pillar.example | 1 + users/init.sls | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pillar.example b/pillar.example index fedcaaf..256303a 100644 --- a/pillar.example +++ b/pillar.example @@ -11,6 +11,7 @@ users: # WARNING: If 'empty_password' is set to True, the 'password' statement # will be ignored by enabling password-less login for the user. empty_password: False + hash_password: False system: False home: /custom/buser homedir_owner: buser diff --git a/users/init.sls b/users/init.sls index 83eabaf..d92b999 100644 --- a/users/init.sls +++ b/users/init.sls @@ -93,6 +93,9 @@ users_{{ name }}_user: {% if 'enforce_password' in user -%} - enforce_password: {{ user['enforce_password'] }} {% endif -%} + {% if 'hash_password' in user -%} + - hash_password: {{ user['hash_password'] }} + {% endif -%} {% if user.get('system', False) -%} - system: True {% endif -%} From e81f6e695caf083a7a9c77338951330d209c3c80 Mon Sep 17 00:00:00 2001 From: Sonia Hamilton Date: Thu, 8 Dec 2016 03:29:03 +0000 Subject: [PATCH 7/7] temp fix on git executable --- users/init.sls | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/users/init.sls b/users/init.sls index d92b999..969c3d0 100644 --- a/users/init.sls +++ b/users/init.sls @@ -430,12 +430,20 @@ users_googleauth-{{ svc }}-{{ name }}: {%- endfor %} {%- endif %} +# +# if not salt['cmd.has_exec']('git') +# fails even if git is installed +# +# this doesn't work (Salt bug), therefore need to run state.apply twice +#include: +# - users +# +#git: +# pkg.installed: +# - require_in: +# - sls: users +# {% if 'gitconfig' in user %} -{% if not salt['cmd.has_exec']('git') %} -skip_{{ name }}_gitconfig_since_git_not_installed: - test.fail_without_changes: - - name: "Git configuration for user {{ name }} has been skipped because Git is not installed." -{% else %} {% for key, value in user['gitconfig'].items() %} users_{{ name }}_user_gitconfig_{{ loop.index0 }}: {% if grains['saltversioninfo'] >= (2015, 8, 0, 0) %} @@ -453,7 +461,6 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}: {% endif %} {% endfor %} {% endif %} -{% endif %} {% endfor %}