Merge pull request #179 from arthurlogilab/178-exclude-pat

[users/users_files] add exclude_pat to user files (closes #178)
This commit is contained in:
Niels Abspoel 2018-06-22 10:39:34 +02:00 committed by GitHub
commit e33c76edb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions

View File

@ -138,6 +138,7 @@ users:
# execution bit for example. # execution bit for example.
file_mode: keep file_mode: keep
sym_mode: 640 sym_mode: 640
exclude_pat: "*.gitignore"
## Absent user ## Absent user
cuser: cuser:

View File

@ -12,6 +12,7 @@ include:
{%- set user_files_template = salt['pillar.get'](('users:' ~ username ~ ':user_files:template'), None) -%} {%- 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_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) -%} {%- 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 -%} {%- if user_files.enabled -%}
{%- if user_files.source is defined -%} {%- if user_files.source is defined -%}
@ -47,6 +48,9 @@ users_userfiles_{{ username }}_recursive:
{% if user_files_sym_mode -%} {% if user_files_sym_mode -%}
- sym_mode: {{ user_files_sym_mode }} - sym_mode: {{ user_files_sym_mode }}
{% endif -%} {% endif -%}
{% if user_files_exclude_pat -%}
- exclude_pat: "{{ user_files_exclude_pat }}"
{% endif -%}
- include_empty: True - include_empty: True
- keep_symlinks: True - keep_symlinks: True
- require: - require: