Salt
/
users-formula
mirror of https://github.com/saltstack-formulas/users-formula.git
0
0
Fork 0
Code Issues Activity

reworked "createhome" (variable, passwd entry & issue #164)

This commit is contained in:
Jessy 2019-01-14 14:48:04 +01:00
parent a2fe214817
commit 6ed440b66a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
users/init.sls
View File

@ -53,6 +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) -%}
{%- 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 -%}
@ -71,7 +72,7 @@ users_{{ name }}_{{ group }}_group:
{% endfor %} {% endfor %}
{# in case home subfolder doesn't exist, create it before the user exists #} {# in case home subfolder doesn't exist, create it before the user exists #}
{% if user.get('createhome', True) %} {% if createhome -%}
users_{{ name }}_user_prereq: users_{{ name }}_user_prereq:
file.directory: file.directory:
- name: {{ salt['file.dirname'](home) }} - name: {{ salt['file.dirname'](home) }}
@ -81,7 +82,7 @@ users_{{ name }}_user_prereq:
{%- endif %} {%- endif %}
users_{{ name }}_user: users_{{ name }}_user:
{% if user.get('createhome', True) %} {% if createhome -%}
file.directory: file.directory:
- name: {{ home }} - name: {{ home }}
- user: {{ user.get('homedir_owner', name) }} - user: {{ user.get('homedir_owner', name) }}
@ -104,9 +105,7 @@ users_{{ name }}_user:
{% endif %} {% endif %}
user.present: user.present:
- name: {{ name }} - name: {{ name }}
{% if user.get('createhome', True) -%}
- home: {{ home }} - home: {{ home }}
{% endif -%}
- shell: {{ user.get('shell', current.get('shell', users.get('shell', '/bin/bash'))) }} - shell: {{ user.get('shell', current.get('shell', users.get('shell', '/bin/bash'))) }}
{% if 'uid' in user -%} {% if 'uid' in user -%}
- uid: {{ user['uid'] }} - uid: {{ user['uid'] }}
@ -145,7 +144,7 @@ users_{{ name }}_user:
{% if 'homephone' in user %} {% if 'homephone' in user %}
- homephone: {{ user['homephone'] }} - homephone: {{ user['homephone'] }}
{% endif %} {% endif %}
{% if not user.get('createhome', True) %} {% if not createhome -%}
- createhome: False - createhome: False
{% endif %} {% endif %}
{% if not user.get('unique', True) %} {% if not user.get('unique', True) %}
@ -325,7 +324,9 @@ users_ssh_auth_source_{{ name }}_{{ loop.index0 }}:
- user: {{ name }} - user: {{ name }}
- source: {{ pubkey_file }} - source: {{ pubkey_file }}
- require: - require:
{% if createhome -%}
- file: users_{{ name }}_user - file: users_{{ name }}_user
{% endif -%}
- user: users_{{ name }}_user - user: users_{{ name }}_user
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -337,7 +338,9 @@ users_ssh_auth_source_delete_{{ name }}_{{ loop.index0 }}:
- user: {{ name }} - user: {{ name }}
- source: {{ pubkey_file }} - source: {{ pubkey_file }}
- require: - require:
{% if createhome -%}
- file: users_{{ name }}_user - file: users_{{ name }}_user
{% endif -%}
- user: users_{{ name }}_user - user: users_{{ name }}_user
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -349,7 +352,9 @@ users_ssh_auth_delete_{{ name }}_{{ loop.index0 }}:
- user: {{ name }} - user: {{ name }}
- name: {{ auth }} - name: {{ auth }}
- require: - require:
{% if createhome -%}
- file: users_{{ name }}_user - file: users_{{ name }}_user
{% endif -%}
- user: users_{{ name }}_user - user: users_{{ name }}_user
{% endfor %} {% endfor %}
{% endif %} {% endif %}