From 2f3132fde0d00266763b3ba2155039ff6f748406 Mon Sep 17 00:00:00 2001
From: Tobias Martin <tobias.martin@rocket-internet.de>
Date: Fri, 18 Nov 2016 12:44:38 +0100
Subject: [PATCH] removed old users and group before creating new ones

---
 users/init.sls | 73 +++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/users/init.sls b/users/init.sls
index b8dbf9a..3dcad0f 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -47,6 +47,42 @@ include:
 {%- set user_group = name -%}
 {%- 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 group in user.get('groups', []) %}
 users_{{ name }}_{{ group }}_group:
   group.present:
@@ -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 %}