incorporated change suggestions

This commit is contained in:
root 2019-01-17 13:32:08 +01:00
parent 6ed440b66a
commit fd25c3e4a4
2 changed files with 3 additions and 4 deletions

View File

@ -6,4 +6,5 @@ users-formula:
users: users:
allow_gid_change: True allow_gid_change: True
createhome: True

View File

@ -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 %}