Merge pull request #143 from hatifnatt/dev

Add ability to specify mode for files and symlinks in user_files
This commit is contained in:
Niels Abspoel
2017-07-27 20:01:16 +02:00
committed by GitHub
2 changed files with 13 additions and 0 deletions
+8
View File
@@ -9,6 +9,8 @@ include:
{%- 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'), current.get('home', '/home/' ~ username )) -%}
{%- set user_files_file_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:file_mode'), False) -%}
{%- set user_files_sym_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:sym_mode'), False) -%}
{%- if user_files.enabled -%}
{%- if user_files.source is defined -%}
@@ -35,6 +37,12 @@ users_userfiles_{{ username }}_recursive:
- user: {{ username }}
- group: {{ user_group }}
- clean: False
{% if user_files_file_mode -%}
- file_mode: {{ user_files_file_mode }}
{% endif -%}
{% if user_files_sym_mode -%}
- sym_mode: {{ user_files_sym_mode }}
{% endif -%}
- include_empty: True
- keep_symlinks: True
- require: