mirror of
https://github.com/saltstack-formulas/users-formula.git
synced 2026-02-21 06:53:59 +01:00
moved the user and group removal out of the for block to avoid duplicate ids
This commit is contained in:
parent
2f3132fde0
commit
7a19ff5c20
@ -33,20 +33,6 @@ include:
|
||||
{%- 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()
|
||||
if user.absent is defined and user.absent %}
|
||||
users_absent_user_{{ name }}:
|
||||
@ -83,6 +69,20 @@ users_absent_group_{{ group }}:
|
||||
- name: {{ group }}
|
||||
{% 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', []) %}
|
||||
users_{{ name }}_{{ group }}_group:
|
||||
group.present:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user