Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows repo settings using values from 2015.8 documentation #205

Merged
merged 3 commits into from
Mar 4, 2016
Merged

Fix Windows repo settings using values from 2015.8 documentation #205

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7474d42
Fix Windows repo settings using values from 2015.8 documentation
myii Mar 4, 2016
c4e116e
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 min…
myii Mar 4, 2016
7f36259
Remove excessive blank lines rendered after "Miscellaneous settings"
myii Mar 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 45 additions & 20 deletions salt/files/master.d/f_defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,25 +1108,50 @@ 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 %}
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 %}
#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 Expand Up @@ -1161,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 %}