Merge pull request #82 from juiceinc/master

Add support for presence_events setting in master config template
2015-01-07 09:03:12 +05:30 · 2015-01-07 09:03:12 +05:30 · 96b409fa90
parent e8e01e34d9 b19c3acc77
commit 96b409fa90
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 %}