Skip to content

Commit

Permalink
Quotation and ipv6 (#355)
Browse files Browse the repository at this point in the history
* Added quotration around globing rules
  • Loading branch information
t0fik authored and aboe76 committed Apr 5, 2018
1 parent dd731c6 commit d1e4768
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions salt/files/master.d/f_defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -892,44 +892,44 @@ master_tops:
# 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,
# 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') %}
file_ignore_regex:
{% for regex in cfg_master['file_ignore_regex'] %}
{%- for regex in cfg_master['file_ignore_regex'] %}
- {{ regex }}
{% endfor %}
{% elif 'file_ignore_regex' in cfg_salt %}
{%- endfor %}
{%- elif 'file_ignore_regex' in cfg_salt %}
file_ignore_regex:
{% for regex in cfg_salt['file_ignore_regex'] %}
{%- for regex in cfg_salt['file_ignore_regex'] %}
- {{ regex }}
{% endfor %}
{% else %}
{%- endfor %}
{%- else %}
#file_ignore_regex:
# - '/\.svn($|/)'
# - '/\.git($|/)'
{% endif %}
{%- endif %}

# 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
# to file_ignore_regex above, but works on globs instead of regex. By default
# nothing is ignored.
{% if 'file_ignore_glob' in cfg_master %}
{%- if 'file_ignore_glob' in cfg_master %}
{%- do default_keys.append('file_ignore_glob') %}
file_ignore_glob:
{% for glob in cfg_master['file_ignore_glob'] %}
- {{ glob }}
{% endfor %}
{% elif 'file_ignore_glob' in cfg_salt %}
{%- for glob in cfg_master['file_ignore_glob'] %}
- '{{ glob }}'
{%- endfor %}
{%- elif 'file_ignore_glob' in cfg_salt %}
file_ignore_glob:
{% for glob in cfg_salt['file_ignore_glob'] %}
- {{ glob }}
{% endfor %}
{% else %}
{%- for glob in cfg_salt['file_ignore_glob'] %}
- '{{ glob }}'
{%- endfor %}
{%- else %}
# file_ignore_glob:
# - '*.pyc'
# - '*/somefolder/*.bak'
# - '*.swp'
{% endif %}
{%- endif %}

# File Server Backend
#
Expand Down

0 comments on commit d1e4768

Please sign in to comment.