diff --git a/pillar.example b/pillar.example index f58f05e..01fc0d6 100644 --- a/pillar.example +++ b/pillar.example @@ -164,6 +164,7 @@ users: # it's possible to use 'keep' for file_mode, to preserve file original mode, thus you can save # execution bit for example. file_mode: keep + #dir_mode: 775 sym_mode: 640 exclude_pat: "*.gitignore" diff --git a/users/user_files.sls b/users/user_files.sls index c66ca40..7b026fb 100644 --- a/users/user_files.sls +++ b/users/user_files.sls @@ -11,6 +11,7 @@ include: {%- set user_home = salt['pillar.get'](('users:' ~ username ~ ':home'), current.get('home', '/home/' ~ username )) -%} {%- set user_files_template = salt['pillar.get'](('users:' ~ username ~ ':user_files:template'), None) -%} {%- set user_files_file_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:file_mode'), False) -%} +{%- set user_files_dir_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:dir_mode'), False) -%} {%- set user_files_sym_mode = salt['pillar.get'](('users:' ~ username ~ ':user_files:sym_mode'), False) -%} {%- set user_files_exclude_pat = salt['pillar.get'](('users:' ~ username ~ ':user_files:exclude_pat'), False) -%} {%- if user_files.enabled -%} @@ -45,6 +46,9 @@ users_userfiles_{{ username }}_recursive: {% if user_files_file_mode -%} - file_mode: {{ user_files_file_mode }} {% endif -%} + {% if user_files_dir_mode -%} + - dir_mode: {{ user_files_dir_mode }} + {% endif -%} {% if user_files_sym_mode -%} - sym_mode: {{ user_files_sym_mode }} {% endif -%}