Browse Source

incorporated change suggestions

tags/v0.45.0
Jessy 6 years ago
parent
commit
634deacc73
2 changed files with 3 additions and 4 deletions
  1. +1
    -0
      users/defaults.yaml
  2. +2
    -4
      users/init.sls

+ 1
- 0
users/defaults.yaml View File



users: users:
allow_gid_change: True allow_gid_change: True
createhome: True



+ 2
- 4
users/init.sls View File

{%- 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 -%}
{% if 'homephone' in user %} {% if 'homephone' in user %}
- homephone: {{ user['homephone'] }} - homephone: {{ user['homephone'] }}
{% endif %} {% endif %}
{% if not createhome -%}
- createhome: False
{% endif %}
- createhome: {{ createhome }}
{% if not user.get('unique', True) %} {% if not user.get('unique', True) %}
- unique: False - unique: False
{% endif %} {% endif %}

Loading…
Cancel
Save