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

Merge pull request #112 from saltstack-formulas/revert-107-master 

Revert "User files state without defined home directory"
This commit is contained in:
Niels Abspoel 2016-05-25 21:56:07 +02:00
parent d3e3122624 b7370f7dfb
commit aed2394758
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
users/user_files.sls
View File

@ -7,7 +7,6 @@ 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 home = user.get('home', "/home/%s" % username) -%}
{%- if user_files.enabled -%}
{%- if user_files.source is defined -%}
@ -29,7 +28,7 @@ include:
{%- if not skip_user %}
users_userfiles_{{ username }}_recursive:
file.recurse:
- name: {{ home }}
- name: {{ user.home }}
- source: {{ file_source }}
- user: {{ username }}
- group: {{ user_group }}