Merge pull request #114 from hatifnatt/hatifnatt-user_files.sls
Default path for home folder in user_files.sls if home omitted in pillar [fixed style].
This commit is contained in:
commit
0ab6e3d12b
|
@ -7,6 +7,7 @@ include:
|
|||
{%- for username, user in salt['pillar.get']('users', {}).items() if (user.absent is not defined or not user.absent) -%}
|
||||
{%- set user_files = salt['pillar.get'](('users:' ~ username ~ ':user_files'), {'enabled': False}) -%}
|
||||
{%- set user_group = salt['pillar.get'](('users:' ~ username ~ ':prime_group:name'), username) -%}
|
||||
{%- set user_home = salt['pillar.get'](('users:' ~ username ~ ':home'), '/home/' ~ username ) -%}
|
||||
{%- if user_files.enabled -%}
|
||||
|
||||
{%- if user_files.source is defined -%}
|
||||
|
@ -28,7 +29,7 @@ include:
|
|||
{%- if not skip_user %}
|
||||
users_userfiles_{{ username }}_recursive:
|
||||
file.recurse:
|
||||
- name: {{ user.home }}
|
||||
- name: {{ user_home }}
|
||||
- source: {{ file_source }}
|
||||
- user: {{ username }}
|
||||
- group: {{ user_group }}
|
||||
|
|
Loading…
Reference in New Issue