incorporated change suggestions
This commit is contained in:
parent
6ed440b66a
commit
fd25c3e4a4
|
@ -6,4 +6,5 @@ users-formula:
|
||||||
|
|
||||||
users:
|
users:
|
||||||
allow_gid_change: True
|
allow_gid_change: True
|
||||||
|
createhome: True
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ include:
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
{%- set current = salt.user.info(name) -%}
|
{%- set current = salt.user.info(name) -%}
|
||||||
{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
|
{%- set home = user.get('home', current.get('home', "/home/%s" % name)) -%}
|
||||||
{%- set createhome = user.get('createhome', True) -%}
|
{%- set createhome = user.get('createhome') -%}
|
||||||
|
|
||||||
{%- if 'prime_group' in user and 'name' in user['prime_group'] %}
|
{%- if 'prime_group' in user and 'name' in user['prime_group'] %}
|
||||||
{%- set user_group = user.prime_group.name -%}
|
{%- set user_group = user.prime_group.name -%}
|
||||||
|
@ -144,9 +144,7 @@ users_{{ name }}_user:
|
||||||
{% if 'homephone' in user %}
|
{% if 'homephone' in user %}
|
||||||
- homephone: {{ user['homephone'] }}
|
- homephone: {{ user['homephone'] }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if not createhome -%}
|
- createhome: {{ createhome }}
|
||||||
- createhome: False
|
|
||||||
{% endif %}
|
|
||||||
{% if not user.get('unique', True) %}
|
{% if not user.get('unique', True) %}
|
||||||
- unique: False
|
- unique: False
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Reference in New Issue