Merge branch 'master' into use_lookup_map.jinja

2015-01-07 21:03:52 +01:00 · 2015-01-07 21:03:52 +01:00 · daf04c2688
parent 896578a75a 96b409fa90
commit daf04c2688
1 changed files with 7 additions and 1 deletions
--- a/salt/files/master.d/_defaults.conf
+++ b/salt/files/master.d/_defaults.conf
@ -944,5 +944,11 @@ halite:
 rest_cherrypy:
  {% for name, value in cfg_master['rest_cherrypy'].items() %}
  {{ name }}: {{ value }}
-  {% endfor %}
+  {%- endfor %}
+{%- endif %}
+
+{% if 'presence_events' in cfg_master %}
+#####        presence events         #####
+##########################################
+{{ get_config('presence_events', 'False') }}
 {% endif %}