Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Quotation and ipv6 (#355) 

* Added quotration around globing rules
This commit is contained in:
Jerzy Drozdz 2018-04-05 12:45:59 +02:00 committed by Niels Abspoel
parent dd731c643a
commit d1e4768cdb
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
salt/files/master.d/f_defaults.conf
View File

@ -892,44 +892,44 @@ master_tops:
# For example, if you manage your custom modules and states in subversion # For example, if you manage your custom modules and states in subversion
# and don't want all the '.svn' folders and content synced to your minions, # and don't want all the '.svn' folders and content synced to your minions,
# you could set this to '/\.svn($|/)'. By default nothing is ignored. # you could set this to '/\.svn($|/)'. By default nothing is ignored.
{% if 'file_ignore_regex' in cfg_master %} {%- if 'file_ignore_regex' in cfg_master %}
{%- do default_keys.append('file_ignore_regex') %} {%- do default_keys.append('file_ignore_regex') %}
file_ignore_regex: file_ignore_regex:
{% for regex in cfg_master['file_ignore_regex'] %} {%- for regex in cfg_master['file_ignore_regex'] %}
- {{ regex }} - {{ regex }}
{% endfor %} {%- endfor %}
{% elif 'file_ignore_regex' in cfg_salt %} {%- elif 'file_ignore_regex' in cfg_salt %}
file_ignore_regex: file_ignore_regex:
{% for regex in cfg_salt['file_ignore_regex'] %} {%- for regex in cfg_salt['file_ignore_regex'] %}
- {{ regex }} - {{ regex }}
{% endfor %} {%- endfor %}
{% else %} {%- else %}
#file_ignore_regex: #file_ignore_regex:
# - '/\.svn($|/)' # - '/\.svn($|/)'
# - '/\.git($|/)' # - '/\.git($|/)'
{% endif %} {%- endif %}
# A file glob (or list of file globs) that will be matched against the file # A file glob (or list of file globs) that will be matched against the file
# path before syncing the modules and states to the minions. This is similar # path before syncing the modules and states to the minions. This is similar
# to file_ignore_regex above, but works on globs instead of regex. By default # to file_ignore_regex above, but works on globs instead of regex. By default
# nothing is ignored. # nothing is ignored.
{% if 'file_ignore_glob' in cfg_master %} {%- if 'file_ignore_glob' in cfg_master %}
{%- do default_keys.append('file_ignore_glob') %} {%- do default_keys.append('file_ignore_glob') %}
file_ignore_glob: file_ignore_glob:
{% for glob in cfg_master['file_ignore_glob'] %} {%- for glob in cfg_master['file_ignore_glob'] %}
- {{ glob }} - '{{ glob }}'
{% endfor %} {%- endfor %}
{% elif 'file_ignore_glob' in cfg_salt %} {%- elif 'file_ignore_glob' in cfg_salt %}
file_ignore_glob: file_ignore_glob:
{% for glob in cfg_salt['file_ignore_glob'] %} {%- for glob in cfg_salt['file_ignore_glob'] %}
- {{ glob }} - '{{ glob }}'
{% endfor %} {%- endfor %}
{% else %} {%- else %}
# file_ignore_glob: # file_ignore_glob:
# - '*.pyc' # - '*.pyc'
# - '*/somefolder/*.bak' # - '*/somefolder/*.bak'
# - '*.swp' # - '*.swp'
{% endif %} {%- endif %}
# File Server Backend # File Server Backend
# #