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

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:
Niels Abspoel 2016-06-02 19:42:58 +02:00
parent aed2394758 4b1432fa92
commit 0ab6e3d12b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
users/user_files.sls
View File

@ -7,6 +7,7 @@ include:
{%- for username, user in salt['pillar.get']('users', {}).items() if (user.absent is not defined or not user.absent) -%} {%- 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_files = salt['pillar.get'](('users:' ~ username ~ ':user_files'), {'enabled': False}) -%}
{%- set user_group = salt['pillar.get'](('users:' ~ username ~ ':prime_group:name'), username) -%} {%- 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.enabled -%}
{%- if user_files.source is defined -%} {%- if user_files.source is defined -%}
@ -28,7 +29,7 @@ include:
{%- if not skip_user %} {%- if not skip_user %}
users_userfiles_{{ username }}_recursive: users_userfiles_{{ username }}_recursive:
file.recurse: file.recurse:
- name: {{ user.home }} - name: {{ user_home }}
- source: {{ file_source }} - source: {{ file_source }}
- user: {{ username }} - user: {{ username }}
- group: {{ user_group }} - group: {{ user_group }}