reworked "createhome" (variable, passwd entry & issue #164)
This commit is contained in:
parent
a2fe214817
commit
6ed440b66a
@ -53,6 +53,7 @@ include:
|
||||
{%- endif -%}
|
||||
{%- set current = salt.user.info(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'] %}
|
||||
{%- set user_group = user.prime_group.name -%}
|
||||
@ -71,7 +72,7 @@ users_{{ name }}_{{ group }}_group:
|
||||
{% endfor %}
|
||||
|
||||
{# in case home subfolder doesn't exist, create it before the user exists #}
|
||||
{% if user.get('createhome', True) %}
|
||||
{% if createhome -%}
|
||||
users_{{ name }}_user_prereq:
|
||||
file.directory:
|
||||
- name: {{ salt['file.dirname'](home) }}
|
||||
@ -81,7 +82,7 @@ users_{{ name }}_user_prereq:
|
||||
{%- endif %}
|
||||
|
||||
users_{{ name }}_user:
|
||||
{% if user.get('createhome', True) %}
|
||||
{% if createhome -%}
|
||||
file.directory:
|
||||
- name: {{ home }}
|
||||
- user: {{ user.get('homedir_owner', name) }}
|
||||
@ -104,9 +105,7 @@ users_{{ name }}_user:
|
||||
{% endif %}
|
||||
user.present:
|
||||
- name: {{ name }}
|
||||
{% if user.get('createhome', True) -%}
|
||||
- home: {{ home }}
|
||||
{% endif -%}
|
||||
- shell: {{ user.get('shell', current.get('shell', users.get('shell', '/bin/bash'))) }}
|
||||
{% if 'uid' in user -%}
|
||||
- uid: {{ user['uid'] }}
|
||||
@ -145,7 +144,7 @@ users_{{ name }}_user:
|
||||
{% if 'homephone' in user %}
|
||||
- homephone: {{ user['homephone'] }}
|
||||
{% endif %}
|
||||
{% if not user.get('createhome', True) %}
|
||||
{% if not createhome -%}
|
||||
- createhome: False
|
||||
{% endif %}
|
||||
{% if not user.get('unique', True) %}
|
||||
@ -325,7 +324,9 @@ users_ssh_auth_source_{{ name }}_{{ loop.index0 }}:
|
||||
- user: {{ name }}
|
||||
- source: {{ pubkey_file }}
|
||||
- require:
|
||||
{% if createhome -%}
|
||||
- file: users_{{ name }}_user
|
||||
{% endif -%}
|
||||
- user: users_{{ name }}_user
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
@ -337,7 +338,9 @@ users_ssh_auth_source_delete_{{ name }}_{{ loop.index0 }}:
|
||||
- user: {{ name }}
|
||||
- source: {{ pubkey_file }}
|
||||
- require:
|
||||
{% if createhome -%}
|
||||
- file: users_{{ name }}_user
|
||||
{% endif -%}
|
||||
- user: users_{{ name }}_user
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
@ -349,7 +352,9 @@ users_ssh_auth_delete_{{ name }}_{{ loop.index0 }}:
|
||||
- user: {{ name }}
|
||||
- name: {{ auth }}
|
||||
- require:
|
||||
{% if createhome -%}
|
||||
- file: users_{{ name }}_user
|
||||
{% endif -%}
|
||||
- user: users_{{ name }}_user
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
Loading…
Reference in New Issue
Block a user