From 4edf0b2b60c592fc714356ce6b0aa65f6781efef Mon Sep 17 00:00:00 2001
From: Jerzy Drozdz <jerzy.drozdz@jdsieci.pl>
Date: Thu, 11 Jan 2018 19:38:30 +0100
Subject: [PATCH 1/2] Added ipv6 option

---
 salt/files/minion.d/f_defaults.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index ddc286090..5bf5961d1 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -41,6 +41,9 @@ master:
 {{ get_config('master', 'salt') }}
 {%- endif %}
 
+# Set whether the minion should connect to the master via IPv6:
+{{ get_config('ipv6', 'False') }}
+
 # Set http proxy information for the minion when doing requests
 {% if 'proxy_host' in cfg_minion -%}
 {%- do default_keys.append('proxy_host') %}

From 45bde072e279b0b1abbb683b1cf7ed18cbed52d6 Mon Sep 17 00:00:00 2001
From: Jerzy Drozdz <jerzy.drozdz@jdsieci.pl>
Date: Thu, 11 Jan 2018 19:39:13 +0100
Subject: [PATCH 2/2] Added quotration around globing rules

---
 salt/files/master.d/f_defaults.conf | 36 ++++++++++++++---------------
 salt/files/minion.d/f_defaults.conf |  3 ---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index cb84ad735..5303722d1 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -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
 #
diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index 5bf5961d1..ddc286090 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -41,9 +41,6 @@ master:
 {{ get_config('master', 'salt') }}
 {%- endif %}
 
-# Set whether the minion should connect to the master via IPv6:
-{{ get_config('ipv6', 'False') }}
-
 # Set http proxy information for the minion when doing requests
 {% if 'proxy_host' in cfg_minion -%}
 {%- do default_keys.append('proxy_host') %}