From a89d8d9b6bc31bc7681ed5ae96772d4812003622 Mon Sep 17 00:00:00 2001
From: "Jeremy T. Bouse" <Jeremy.Bouse@UnderGrid.net>
Date: Sun, 4 Sep 2016 14:47:39 +0000
Subject: [PATCH 1/3] Add winrepo_provider to master.d/f_defaults.conf

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

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 002d371..3a9bc76 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1304,6 +1304,12 @@ nodegroups:
 
 #####  Windows Software Repo settings #####
 ###########################################
+# Specify the provider to be used for git_pillar. Must be either pygit2 or
+# gitpython. If unset, then both will be tried in that same order, and the
+# first one with a compatible version installed will be the provider that
+# is used.
+{{ get_config('winrepo_provider', 'pygit2') }}
+
 # Repo settings for 2015.8+ master used with 2015.8+ Windows minions
 #
 # Location of the repo on the master:
@@ -1441,4 +1447,4 @@ mongo.{{ name }}: {{ value }}
 alternative.mongo.{{ name }}: {{ value }}
 {%- endfor %}
 {% endif %}
-{%- endif %}
\ No newline at end of file
+{%- endif %}

From 79fcda8806c6e92ebbcedd355fc49b0bd0473a5e Mon Sep 17 00:00:00 2001
From: "Jeremy T. Bouse" <Jeremy.Bouse@UnderGrid.net>
Date: Sun, 4 Sep 2016 14:48:10 +0000
Subject: [PATCH 2/3] Clean up formating of nodegroups

---
 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 3a9bc76..6550c56 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1282,17 +1282,17 @@ log_granular_levels:
 #nodegroups:
 #  group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com'
 #  group2: 'G@os:Debian and foo.domain.com'
-{% if 'nodegroups' in cfg_master %}
+{%- if 'nodegroups' in cfg_master %}
 nodegroups:
-  {% for name, lvl in cfg_master['nodegroups'].items() %}
+  {%- for name, lvl in cfg_master['nodegroups'].items() %}
   {{ name }}: {{ lvl }}
-  {% endfor %}
-{% elif 'nodegroups' in cfg_salt %}
+  {%- endfor %}
+{%- elif 'nodegroups' in cfg_salt %}
 nodegroups:
-  {% for name, lvl in cfg_salt['nodegroups'].items() %}
+  {%- for name, lvl in cfg_salt['nodegroups'].items() %}
   {{ name }}: {{ lvl }}
-  {% endfor %}
-{% endif %}
+  {%- endfor %}
+{%- endif %}
 
 #####     Range Cluster settings     #####
 ##########################################

From 4283cba1234da9a3da9e1c95a768d898fa20bdce Mon Sep 17 00:00:00 2001
From: "Jeremy T. Bouse" <Jeremy.Bouse@UnderGrid.net>
Date: Tue, 6 Sep 2016 05:33:23 +0000
Subject: [PATCH 3/3] Add example for winrepo_provider

---
 pillar.example | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pillar.example b/pillar.example
index 4b0938a..9575dc9 100644
--- a/pillar.example
+++ b/pillar.example
@@ -74,6 +74,11 @@ salt:
       # filter to use for Most other LDAP servers
     auth.ldap.filter: {% raw %}'uid={{ username }}'{% endraw %}
 
+    # Define winrepo provider, by default support order is pygit2, gitpython
+    # Set to gitpython for Debian & Ubuntu to get around saltstack/salt#35993
+    # where pygit2 is not compiled with pygit2.GIT_FEATURE_HTTPS support
+    winrepo_provider: gitpython
+
     # optional engine configuration
     engines:
       slack: