Merge pull request #205 from myii/PR_FixWindowsRepoSettings

Fix Windows repo settings using values from 2015.8 documentation

salt/files/master.d/f_defaults.conf

@@ -1108,18 +1108,20 @@ 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('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 %}
+{% if 'winrepo_remotes_ng' in cfg_master %}
-win_gitrepos_ng:
+winrepo_remotes_ng:
-  {% for repo in cfg_master['win_gitrepos_ng'] %}
+  {% for repo in cfg_master['winrepo_remotes_ng'] %}
   - {{ repo }}
   {% endfor %}
-{% elif 'win_gitrepos_ng' in cfg_salt %}
+{% elif 'winrepo_remotes_ng' in cfg_salt %}
-win_gitrepos_ng:
+winrepo_remotes_ng:
-  {% for repo in cfg_salt['win_gitrepos_ng'] %}
+  {% for repo in cfg_salt['winrepo_remotes_ng'] %}
   - {{ repo }}
   {% endfor %}
 {% else %}
@@ -1127,6 +1129,29 @@ win_gitrepos_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 #####
 ########################################################
@@ -1166,44 +1191,44 @@ win_gitrepos:
 # 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 %}
+  {%- endfor %}
-{% endif %}
+{%- 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 %}