From 6ca7aa0078092e0dd724d794d402f28daac0722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Fri, 23 Jan 2015 20:52:14 +0100 Subject: [PATCH 1/5] Remove leading whitespaces. --- users/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/init.sls b/users/init.sls index 41877c7..60cf5e1 100644 --- a/users/init.sls +++ b/users/init.sls @@ -173,7 +173,7 @@ sudoer-{{ name }}: file.managed: - name: {{ users.sudoers_dir }}/{{ name }} - user: root - - group: {{ users.root_group }} + - group: {{ users.root_group }} - mode: '0440' {% if 'sudo_rules' in user %} {% for rule in user['sudo_rules'] %} @@ -181,7 +181,7 @@ sudoer-{{ name }}: cmd.run: - name: 'visudo -cf - <<<"$rule" | { read output; if [[ $output != "stdin: parsed OK" ]] ; then echo $output ; fi }' - stateful: True - - shell: {{ users.visudo_shell }} + - shell: {{ users.visudo_shell }} - env: # Specify the rule via an env var to avoid shell quoting issues. - rule: "{{ name }} {{ rule }}" From 1e3f6c98652e47b369ca5a7732f27e94eed99b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Sat, 24 Jan 2015 03:31:01 +0100 Subject: [PATCH 2/5] Fix pillar.example->sudo_rules. --- pillar.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pillar.example b/pillar.example index 9085ac2..93eeb74 100644 --- a/pillar.example +++ b/pillar.example @@ -12,8 +12,8 @@ users: expire: 16426 sudouser: True sudo_rules: - - ALL=(root) /usr/bin/find - - ALL=(otheruser) /usr/bin/script.sh + - 'ALL=(root) /usr/bin/find' + - 'ALL=(otheruser) /usr/bin/script.sh' shell: /bin/bash prime_group: name: primarygroup From c1b383d78b502a70477d8f7601c2555243094024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Thu, 12 Mar 2015 23:27:31 +0100 Subject: [PATCH 3/5] Add ability to create system users. --- users/init.sls | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/users/init.sls b/users/init.sls index 60cf5e1..261dd7f 100644 --- a/users/init.sls +++ b/users/init.sls @@ -72,6 +72,9 @@ include: {% if 'password' in user -%} - password: '{{ user['password'] }}' {% endif -%} + {% if user.get('system', False) -%} + - system: True + {% endif -%} {% if 'prime_group' in user and 'gid' in user['prime_group'] -%} - gid: {{ user['prime_group']['gid'] }} {% else -%} @@ -252,4 +255,3 @@ googleauth-{{ svc }}-{{ name }}: {{ group }}: group.absent {% endfor %} - From 00cc889683dea47b03fa7acfa7bd288917c3ea1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Sat, 11 Jul 2015 10:35:15 +0200 Subject: [PATCH 4/5] Fix some smaller bugs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: René Jochum --- users/init.sls | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/users/init.sls b/users/init.sls index 261dd7f..e18643d 100644 --- a/users/init.sls +++ b/users/init.sls @@ -3,7 +3,7 @@ {% set used_sudo = [] %} {% set used_googleauth = [] %} -{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %} +{%- for name, user in pillar.get('users', {}).iteritems() if user.absent is not defined or not user.absent %} {%- if user == None -%} {%- set user = {} -%} {%- endif -%} @@ -25,7 +25,7 @@ include: {%- endif %} {%- endif %} -{% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %} +{% for name, user in pillar.get('users', {}).iteritems() if user.absent is not defined or not user.absent %} {%- if user == None -%} {%- set user = {} -%} {%- endif -%} @@ -52,7 +52,7 @@ include: - group: {{ user_group }} - mode: {{ user.get('user_dir_mode', '0750') }} - require: - - user: {{ name }} + - user: {{ name }}_user - group: {{ user_group }} {%- endif %} group.present: @@ -101,6 +101,7 @@ include: - group: {{ group }} {% endfor %} + {% if 'ssh_keys' in user or 'ssh_auth' in user or 'ssh_auth.absent' in user %} user_keydir_{{ name }}: file.directory: - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh @@ -114,6 +115,7 @@ user_keydir_{{ name }}: {%- for group in user.get('groups', []) %} - group: {{ group }} {%- endfor %} + {% endif %} {% if 'ssh_keys' in user %} {% set key_type = 'id_' + user.get('ssh_key_type', 'rsa') %} @@ -225,7 +227,7 @@ googleauth-{{ svc }}-{{ name }}: {% endfor %} -{% for name, user in pillar.get('users', {}).items() if user.absent is defined and user.absent %} +{% for name, user in pillar.get('users', {}).iteritems() if user.absent is defined and user.absent %} {{ name }}: {% if 'purge' in user or 'force' in user %} user.absent: From a1d65914475db99fce5ce63111b5b2d90e916a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Mon, 13 Jul 2015 13:51:02 +0200 Subject: [PATCH 5/5] Fix users/init.sls. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: René Jochum --- users/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/init.sls b/users/init.sls index 21b125b..ff1b909 100644 --- a/users/init.sls +++ b/users/init.sls @@ -52,7 +52,7 @@ users_{{ name }}_user: - group: {{ user_group }} - mode: {{ user.get('user_dir_mode', '0750') }} - require: - - user: {{ name }}_user + - user: users_{{ name }}_user - group: {{ user_group }} {%- endif %} group.present: