saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge branch 'master' into use_lookup_map.jinja

Browse Source
This commit is contained in:
Niels Abspoel 2015-01-07 21:03:52 +01:00
commit daf04c2688
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/files/master.d/_defaults.conf
View File

@ -944,5 +944,11 @@ halite:
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 %}
{% if 'presence_events' in cfg_master %}
##### presence events #####
##########################################
{{ get_config('presence_events', 'False') }}
{% endif %} {% endif %}