From 7474d4239d42160a513c5e647884f413cd6ad430 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 4 Mar 2016 11:27:45 +0000
Subject: [PATCH 1/3] Fix Windows repo settings using values from 2015.8
 documentation

---
 salt/files/master.d/f_defaults.conf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index c183514..50db276 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1109,17 +1109,17 @@ nodegroups:
 #####  Windows Software Repo settings #####
 ###########################################
 # Location of the repo on the master:
-{{ get_config('win_repo_dir_ng', '/srv/salt/win/repo-ng') }}
+{{ get_config('winrepo_dir_ng', '/srv/salt/win/repo-ng') }}
 
 # List of git repositories to include with the local repo:
-{% if 'win_gitrepos_ng' in cfg_master %}
-win_gitrepos_ng:
-  {% for repo in cfg_master['win_gitrepos_ng'] %}
+{% if 'winrepo_remotes_ng' in cfg_master %}
+winrepo_remotes_ng:
+  {% for repo in cfg_master['winrepo_remotes_ng'] %}
   - {{ repo }}
   {% endfor %}
-{% elif 'win_gitrepos_ng' in cfg_salt %}
-win_gitrepos_ng:
-  {% for repo in cfg_salt['win_gitrepos_ng'] %}
+{% elif 'winrepo_remotes_ng' in cfg_salt %}
+winrepo_remotes_ng:
+  {% for repo in cfg_salt['winrepo_remotes_ng'] %}
   - {{ repo }}
   {% endfor %}
 {% else %}

From c4e116ee8f07fddbbca44b32799fcf7612d8731f Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 4 Mar 2016 11:30:19 +0000
Subject: [PATCH 2/3] Provide Windows repo settings: 2015.8+ master used for
 pre-2015.8 minions

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

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 50db276..8181e25 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1108,6 +1108,8 @@ nodegroups:
 
 #####  Windows Software Repo settings #####
 ###########################################
+# Repo settings for 2015.8+ master used with 2015.8+ Windows minions
+#
 # Location of the repo on the master:
 {{ get_config('winrepo_dir_ng', '/srv/salt/win/repo-ng') }}
 
@@ -1127,6 +1129,29 @@ winrepo_remotes_ng:
 #  - 'https://github.com/saltstack/salt-winrepo-ng.git'
 {% endif %}
 
+# Repo settings for 2015.8+ master used with pre-2015.8 Windows minions
+#
+# Location of the repo on the master:
+{{ get_config('winrepo_dir', '/srv/salt/win/repo') }}
+
+# Location of the master's repo cache file:
+{{ get_config('winrepo_cachefile', 'winrepo.p') }}
+
+# List of git repositories to include with the local repo:
+{% if 'winrepo_remotes' in cfg_master %}
+winrepo_remotes:
+  {% for repo in cfg_master['winrepo_remotes'] %}
+  - {{ repo }}
+  {% endfor %}
+{% elif 'winrepo_remotes' in cfg_salt %}
+winrepo_remotes:
+  {% for repo in cfg_salt['winrepo_remotes'] %}
+  - {{ repo }}
+  {% endfor %}
+{% else %}
+#winrepo_remotes:
+#  - 'https://github.com/saltstack/salt-winrepo.git'
+{% endif %}
 
 #####  Windows Software Repo settings - Pre 2015.8 #####
 ########################################################

From 7f36259614125ef7c6ff40e66f41e003bf05875d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 4 Mar 2016 11:36:16 +0000
Subject: [PATCH 3/3] Remove excessive blank lines rendered after
 "Miscellaneous settings"

---
 salt/files/master.d/f_defaults.conf | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 8181e25..0f35b2a 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1186,49 +1186,49 @@ win_gitrepos:
 {{ get_config('return', '')}}
 
 
-######    Miscellaneous  settings     ######
+######     Miscellaneous settings     ######
 ############################################
 # Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch
 {{ get_config('event_match_type', 'startswith') }}
 
-{% if 'halite' in cfg_master %}
+{%- if 'halite' in cfg_master %}
 #####             Halite             #####
 ##########################################
 halite:
-  {% for name, value in cfg_master['halite'].items() %}
+  {%- for name, value in cfg_master['halite'].items() %}
   {{ name }}: {{ value }}
-  {% endfor %}
-{% endif %}
+  {%- endfor %}
+{%- endif %}
 
-{% if 'rest_cherrypy' in cfg_master %}
+{%- if 'rest_cherrypy' in cfg_master %}
 #####         rest_cherrypy          #####
 ##########################################
 rest_cherrypy:
-  {% for name, value in cfg_master['rest_cherrypy'].items() %}
+  {%- for name, value in cfg_master['rest_cherrypy'].items() %}
   {{ name }}: {{ value }}
   {%- endfor %}
 {%- endif %}
 
-{% if 'rest_tornado' in cfg_master %}
+{%- if 'rest_tornado' in cfg_master %}
 #####         rest_tornado            #####
 ###########################################
 rest_tornado:
-  {% for name, value in cfg_master['rest_tornado'].items() %}
+  {%- for name, value in cfg_master['rest_tornado'].items() %}
   {{ name }}: {{ value }}
   {%- endfor %}
 {%- endif %}
 
-{% if 'presence_events' in cfg_master %}
+{%- if 'presence_events' in cfg_master %}
 #####        presence events         #####
 ##########################################
 {{ get_config('presence_events', 'False') }}
-{% endif %}
+{%- endif %}
 
-{% if 'consul_config' in cfg_master %}
+{%- if 'consul_config' in cfg_master %}
 #####         consul_config          #####
 ##########################################
 consul_config:
-  {% for name, value in cfg_master['consul_config'].items() %}
+  {%- for name, value in cfg_master['consul_config'].items() %}
   {{ name }}: {{ value }}
   {%- endfor %}
 {%- endif %}