Merge branch 'master' of git.tcpcloud.eu:saltstack-formulas/heka-formula
diff --git a/heka/server.sls b/heka/server.sls
index 4873886..49145ec 100644
--- a/heka/server.sls
+++ b/heka/server.sls
@@ -148,7 +148,8 @@
{%- for service_name, service in pillar.items() %}
{%- for role_name, role in service.iteritems() %}
-{%- if role.get('logging', {}).get('heka', {}).get('enabled', False) %}
+{%- if role.logging is defined and role.logging.heka is defined %}
+{%- if role.logging.heka.get('enabled', False) %}
/etc/heka/conf.d/99-{{ service_name }}-{{ role_name }}.toml:
file.managed:
@@ -162,6 +163,7 @@
- service: heka_service
{%- endif %}
+{%- endif %}
{%- endfor %}
{%- endfor %}