Skip to content

Commit

Permalink
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 min…
Browse files Browse the repository at this point in the history
…ions
  • Loading branch information
myii committed Mar 4, 2016
1 parent 7474d42 commit c4e116e
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions salt/files/master.d/f_defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}

Expand All @@ -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 #####
########################################################
Expand Down

0 comments on commit c4e116e

Please sign in to comment.