Merge pull request #82 from juiceinc/master

Add support for presence_events setting in master config template
saltstack-formulas · Jan 7, 2015 · 96b409f · 96b409f
2 parents e8e01e3 + b19c3ac
commit 96b409f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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 %}