Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Remove excessive blank lines rendered after "Miscellaneous settings"

This commit is contained in:
Imran Iqbal 2016-03-04 11:36:16 +00:00
parent c4e116ee8f
commit 7f36259614
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/files/master.d/f_defaults.conf
View File

@ -1186,49 +1186,49 @@ win_gitrepos:
{{ get_config('return', '')}} {{ get_config('return', '')}}
###### Miscellaneous settings ###### ###### Miscellaneous settings ######
############################################ ############################################
# Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch # Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch
{{ get_config('event_match_type', 'startswith') }} {{ get_config('event_match_type', 'startswith') }}
{% if 'halite' in cfg_master %} {%- if 'halite' in cfg_master %}
##### Halite ##### ##### Halite #####
########################################## ##########################################
halite: halite:
{% for name, value in cfg_master['halite'].items() %} {%- for name, value in cfg_master['halite'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{% endfor %} {%- endfor %}
{% endif %} {%- endif %}
{% if 'rest_cherrypy' in cfg_master %} {%- if 'rest_cherrypy' in cfg_master %}
##### rest_cherrypy ##### ##### rest_cherrypy #####
########################################## ##########################################
rest_cherrypy: rest_cherrypy:
{% for name, value in cfg_master['rest_cherrypy'].items() %} {%- for name, value in cfg_master['rest_cherrypy'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{% if 'rest_tornado' in cfg_master %} {%- if 'rest_tornado' in cfg_master %}
##### rest_tornado ##### ##### rest_tornado #####
########################################### ###########################################
rest_tornado: rest_tornado:
{% for name, value in cfg_master['rest_tornado'].items() %} {%- for name, value in cfg_master['rest_tornado'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{% if 'presence_events' in cfg_master %} {%- if 'presence_events' in cfg_master %}
##### presence events ##### ##### presence events #####
########################################## ##########################################
{{ get_config('presence_events', 'False') }} {{ get_config('presence_events', 'False') }}
{% endif %} {%- endif %}
{% if 'consul_config' in cfg_master %} {%- if 'consul_config' in cfg_master %}
##### consul_config ##### ##### consul_config #####
########################################## ##########################################
consul_config: consul_config:
{% for name, value in cfg_master['consul_config'].items() %} {%- for name, value in cfg_master['consul_config'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}