Browse Source

adde dir_mode logic for users.files

tags/v0.46.0^2
Sevrin Robstad 5 years ago
parent
commit
7cf7769a2d
2 changed files with 5 additions and 0 deletions
  1. +1
    -0
      pillar.example
  2. +4
    -0
      users/user_files.sls

+ 1
- 0
pillar.example View File

@@ -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"


+ 4
- 0
users/user_files.sls View File

@@ -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 -%}

Loading…
Cancel
Save