Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2026-05-14 00:00:39 +02:00
Code Issues Activity

moved the user and group removal out of the for block to avoid duplicate ids

Browse Source
This commit is contained in:
Tobias Martin 2016-11-18 16:20:44 +01:00
parent 2f3132fde0
commit 7a19ff5c20
No known key found for this signature in database
GPG Key ID: 944B1153D94EEABF
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
users/init.sls
View File

@ -33,20 +33,6 @@ include:
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{% for name, user in pillar.get('users', {}).items()
if user.absent is not defined or not user.absent %}
{%- if user == None -%}
{%- set user = {} -%}
{%- endif -%}
{%- set current = salt.user.info(name) -%}
{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
{%- if 'prime_group' in user and 'name' in user['prime_group'] %}
{%- set user_group = user.prime_group.name -%}
{%- else -%}
{%- set user_group = name -%}
{%- endif %}
{% for name, user in pillar.get('users', {}).items() {% for name, user in pillar.get('users', {}).items()
if user.absent is defined and user.absent %} if user.absent is defined and user.absent %}
users_absent_user_{{ name }}: users_absent_user_{{ name }}:
@ -83,6 +69,20 @@ users_absent_group_{{ group }}:
- name: {{ group }} - name: {{ group }}
{% endfor %} {% endfor %}
{% for name, user in pillar.get('users', {}).items()
if user.absent is not defined or not user.absent %}
{%- if user == None -%}
{%- set user = {} -%}
{%- endif -%}
{%- set current = salt.user.info(name) -%}
{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
{%- if 'prime_group' in user and 'name' in user['prime_group'] %}
{%- set user_group = user.prime_group.name -%}
{%- else -%}
{%- set user_group = name -%}
{%- endif %}
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
users_{{ name }}_{{ group }}_group: users_{{ name }}_{{ group }}_group:
group.present: group.present: