Merge pull request #14 from T-Systems-MMS/add_debian_compatibility

fix handler name and add the correct path for constants.conf on Debian based installations

Author: xFuture603

roles/icinga_agent/defaults/main.yml

@@ -2,13 +2,21 @@
 icinga_agent_package: icinga2
 icinga_agent_registration: false
 icinga_agent_ca_host_icinga_port: 5665
-icinga_agent_constants_conf: |
-  const PluginDir = "/usr/lib64/nagios/plugins"
-  const PluginContribDir = "/usr/lib64/nagios/plugins"
-  const ManubulonPluginDir = "/usr/lib64/nagios/plugins"
-  const ZoneName = "{{ ansible_hostname }}"
-  const NodeName = "{{ ansible_hostname }}"
-  const TicketSalt = ""
+icinga_agent_constants:
+  RedHat: |
+    const PluginDir = "/usr/lib64/nagios/plugins"
+    const PluginContribDir = "/usr/lib64/nagios/plugins"
+    const ManubulonPluginDir = "/usr/lib64/nagios/plugins"
+    const ZoneName = "{{ ansible_hostname }}"
+    const NodeName = "{{ ansible_hostname }}"
+    const TicketSalt = ""
+  Debian: |
+    const PluginDir = "/usr/lib/nagios/plugins"
+    const PluginContribDir = "/usr/lib/nagios/plugins"
+    const ManubulonPluginDir = "/usr/lib/nagios/plugins"
+    const ZoneName = "{{ ansible_hostname }}"
+    const NodeName = "{{ ansible_hostname }}"
+    const TicketSalt = ""
 icinga_agent_api_conf: |
   accept_config = true
   accept_commands = true

roles/icinga_agent/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: restart icinga2-agent
+- name: start icinga2-agent
   ansible.builtin.service:
     name: icinga2
     enabled: true

roles/icinga_agent/tasks/main.yml

@@ -36,7 +36,7 @@
   with_fileglob:
     - "../templates/configuration/*"
   notify:
-    - restart icinga2-agent
+    - start icinga2-agent
 
 - name: copy icinga feature files
   ansible.builtin.template:
@@ -48,7 +48,7 @@
   with_fileglob:
     - "../templates/features/*"
   notify:
-    - restart icinga2-agent
+    - start icinga2-agent
 
 - name: copy custom icinga feature files
   ansible.builtin.template:
@@ -60,7 +60,7 @@
   with_fileglob:
     - "{{ icinga_agent_custom_features_template_path }}"
   notify:
-    - restart icinga2-agent
+    - start icinga2-agent
   when:
     - icinga_agent_custom_features_template_path is defined
     - icinga_agent_custom_features_template_path | length > 0
@@ -112,7 +112,7 @@
       args:
         creates: "/var/lib/icinga2/certs/ca.crt"
       notify:
-        - restart icinga2-agent
+        - start icinga2-agent
   when:
     - icinga_agent_registration | bool
     - icinga_agent_salt is defined

roles/icinga_agent/templates/configuration/constants.conf.j2

@@ -1,3 +1,3 @@
 # {{ ansible_managed }}
 
-{{ icinga_agent_constants_conf }}
+{{ icinga_agent_constants[ansible_os_family] }}