diff --git a/users/init.sls b/users/init.sls index b8dbf9a8..119ab75b 100644 --- a/users/init.sls +++ b/users/init.sls @@ -33,6 +33,42 @@ include: {%- endif %} {%- endif %} +{% for name, user in pillar.get('users', {}).items() + if user.absent is defined and user.absent %} +users_absent_user_{{ name }}: +{% if 'purge' in user or 'force' in user %} + user.absent: + - name: {{ name }} + {% if 'purge' in user %} + - purge: {{ user['purge'] }} + {% endif %} + {% if 'force' in user %} + - force: {{ user['force'] }} + {% endif %} +{% else %} + user.absent: + - name: {{ name }} +{% endif -%} +users_{{ users.sudoers_dir }}/{{ name }}: + file.absent: + - name: {{ users.sudoers_dir }}/{{ name }} +{% endfor %} + +{% for user in pillar.get('absent_users', []) %} +users_absent_user_2_{{ user }}: + user.absent: + - name: {{ name }} +users_2_{{ users.sudoers_dir }}/{{ user }}: + file.absent: + - name: {{ users.sudoers_dir }}/{{ user }} +{% endfor %} + +{% for group in pillar.get('absent_groups', []) %} +users_absent_group_{{ group }}: + group.absent: + - name: {{ group }} +{% endfor %} + {% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %} {%- if user == None -%} @@ -453,40 +489,3 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}: {% endif %} {% endfor %} - - -{% for name, user in pillar.get('users', {}).items() - if user.absent is defined and user.absent %} -users_absent_user_{{ name }}: -{% if 'purge' in user or 'force' in user %} - user.absent: - - name: {{ name }} - {% if 'purge' in user %} - - purge: {{ user['purge'] }} - {% endif %} - {% if 'force' in user %} - - force: {{ user['force'] }} - {% endif %} -{% else %} - user.absent: - - name: {{ name }} -{% endif -%} -users_{{ users.sudoers_dir }}/{{ name }}: - file.absent: - - name: {{ users.sudoers_dir }}/{{ name }} -{% endfor %} - -{% for user in pillar.get('absent_users', []) %} -users_absent_user_2_{{ user }}: - user.absent: - - name: {{ name }} -users_2_{{ users.sudoers_dir }}/{{ user }}: - file.absent: - - name: {{ users.sudoers_dir }}/{{ user }} -{% endfor %} - -{% for group in pillar.get('absent_groups', []) %} -users_absent_group_{{ group }}: - group.absent: - - name: {{ group }} -{% endfor %}