From 346463c7e7d58ec041da45ef33cfdde9d93cee49 Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Thu, 17 Mar 2016 12:21:23 +0100 Subject: [PATCH 1/4] 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/4] 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/4] 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/4] 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