fix duplicate ids if zabbix-agent and zabbix-server are both enabled

saltstack-formulas · Sep 30, 2016 · cdf5b80 · cdf5b80
1 parent 528a062
commit cdf5b80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/zabbix/agent/init.sls b/zabbix/agent/init.sls
@@ -1,13 +1,15 @@
 {% from "zabbix/map.jinja" import zabbix with context -%}
 
-{{ salt['file.dirname'](zabbix.agent.logfile) }}:
+zabbix-agent-logdir:
   file.directory:
+    - name: {{ salt['file.dirname'](zabbix.agent.logfile) }}
     - user: {{ zabbix.user }}
     - group: {{ zabbix.group }}
     - dirmode: 755
 
-{{ salt['file.dirname'](zabbix.agent.pidfile) }}:
+zabbix-agent-piddir:
   file.directory:
+    - name: {{ salt['file.dirname'](zabbix.agent.pidfile) }}
     - user: {{ zabbix.user }}
     - group: {{ zabbix.group }}
     - dirmode: 750

diff --git a/zabbix/server/init.sls b/zabbix/server/init.sls
@@ -1,14 +1,16 @@
 {% from "zabbix/map.jinja" import zabbix with context -%}
 {% set settings = salt['pillar.get']('zabbix', {}) -%}
 
-{{ salt['file.dirname'](zabbix.server.logfile) }}:
+zabbis-server-logdir:
   file.directory:
+    - name: {{ salt['file.dirname'](zabbix.server.logfile) }}
     - user: {{ zabbix.user }}
     - group: {{ zabbix.group }}
     - dirmode: 755
 
-{{ salt['file.dirname'](zabbix.server.pidfile) }}:
+zabbix-server-piddir:
   file.directory:
+    - name: {{ salt['file.dirname'](zabbix.server.pidfile) }}
     - user: {{ zabbix.user }}
     - group: {{ zabbix.group }}
     - dirmode: 755