Browse Source

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

[users/users_files] add exclude_pat to user files (closes #178)
master
Niels Abspoel 6 years ago
parent
commit
e33c76edb6
No account linked to committer's email address
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

# 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:

+ 4
- 0
users/user_files.sls View File

{%- 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 -%}
{% 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:

Loading…
Cancel
Save