Add yum repo

icinga2/config.sls

@@ -1,11 +1,14 @@
 {% from "icinga2/map.jinja" import icinga2 with context %}
 {% from "icinga2/macros.jinja" import printconfig with context %}
+{% set confd_dir = icinga2.config_dir + '/' + icinga2.config_subdir %}
 
 include:
   - icinga2
 
-/etc/icinga2/conf.d:
+{{confd_dir}}:
   file.directory:
+    - user: {{icinga2.user}}
+    - group: {{icinga2.group}}
     - require:
       - pkg: icinga2
 
@@ -19,12 +22,14 @@ include:
 
 {% for object, type in conf_files.items() %}
   {% if icinga2.config[object] is defined %}
-/etc/icinga2/conf.d/{{object}}.conf:
+{{confd_dir}}/{{object}}.conf:
   file.managed:
     - listen_in:
       - service: icinga2_service
     - require:
-      - file: /etc/icinga2/conf.d
+      - file: {{confd_dir}}
+    - user: {{icinga2.user}}
+    - group: {{icinga2.group}}
     - contents: |
     {%- for obj, objopts in icinga2.config[object].items() %}
       {%- if objopts["for"] is defined %}
@@ -42,6 +47,8 @@ icinga2_zones_conf:
   file.managed:
     - name: {{icinga2.config_dir}}/zones.conf
     - source: salt://icinga2/templates/zones.conf.jinja
+    - user: {{icinga2.user}}
+    - group: {{icinga2.group}}
     - template: jinja
     - require:
       - pkg: icinga2

icinga2/defaults.yaml

@@ -2,6 +2,12 @@ icinga2:
   master_minion_id: salt
   master_fqdn: salt
   port: 5665
+  config_dir: /etc/icinga2
+  config_subdir: conf.d
+  ca_dir: /var/lib/icinga2/ca
+  pki_dir: /etc/icinga2/pki
+  user: icinga
+  group: icinga
   config:
     templates:
       generic-host:

icinga2/init.sls

@@ -1,11 +1,21 @@
 {% from "icinga2/map.jinja" import icinga2 with context %}
 
+{% if grains['os_family'] == 'Debian' %}
 icinga2_repo:
   pkgrepo.managed:
     - humanname: Icinga2 official repo
     - name: {{ icinga2.pkg_repo }}
-    - file: {{ icinga2.repo_file }}
+    - file: /etc/apt/sources.list.d/icinga2.list
     - key_url: http://packages.icinga.org/icinga.key
+{% elif grains['os_family'] == 'RedHat' %}
+icinga2_repo:
+  pkgrepo.managed:
+    - humanname: ICINGA (stable release for epel)
+    - name: icinga-stable-release
+    - baseurl: http://packages.icinga.com/epel/$releasever/release/
+    - gpgcheck: 1
+    - gpgkey: http://packages.icinga.com/icinga.key
+{% endif %}
 
 icinga2_pkg:
   pkg.installed:
@@ -18,3 +28,4 @@ icinga2_service:
     - name: icinga2
     - enable: True
     - reload: True
+

icinga2/os_family.yaml

@@ -2,8 +2,6 @@ Debian:
   user: nagios
   group: nagios
   pkg_repo: deb http://packages.icinga.org/ubuntu icinga-{{ grains.get("oscodename", 'unknown')}} main
-  repo_file: /etc/apt/sources.list.d/icinga2.list
-  config_dir: /etc/icinga2
-  ca_dir: /var/lib/icinga2/ca
-  pki_dir: /etc/icinga2/pki
   pki_pkg: python-m2crypto
+RedHat:
+  pki_pkg: python-m2ext