X-Git-Url: https://arthur.barton.de/gitweb/?p=AnsibleRoles.git;a=blobdiff_plain;f=roles%2Fcheck-mk-agent%2Ftasks%2Fmain.yml;h=65b2a06fb50ec9ae5589bfe1706eb493104f13b2;hp=186f1b496bbf4fad17de690f9b09431d84ac8023;hb=6a985804768b569b80cb3f16709f91301cb5bb5f;hpb=9b4b850399a3ddfbcfee252906e3324795438f89

diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index 186f1b4..65b2a06 100644
--- a/roles/check-mk-agent/tasks/main.yml
+++ b/roles/check-mk-agent/tasks/main.yml
@@ -1,69 +1,93 @@
 ---
 # tasks file for check-mk-agent
 
-- name: install Debian packages for CheckMk agent
+- name: install Debian packages for Check_MK agent (1/2)
+  tags:
+    - check_mk
+    - monitoring
+    - packages
+  apt:
+    state: present
+    name: [
+      'check-mk-agent',
+      'nagios-plugins-basic',
+    ]
+
+- name: install Debian packages for Check_MK agent (2/2)
   tags:
     - check_mk
     - monitoring
     - packages
   apt: >
-    state=installed
-    name={{ item }}
-  with_items:
-    - check-mk-agent
-    - check-mk-agent-logwatch
-    - monitoring-plugins-basic
+    state=present
+    name=check-mk-agent-logwatch
+  when: "ansible_distribution_major_version|int >= 7 and ansible_distribution_major_version|int < 9"
 
 - name: test for systemd unit files
   tags:
     - check_mk
     - monitoring
     - packages
+    - systemd
   stat: path=/etc/systemd/system/check_mk.socket
-  when: "ansible_distribution_major_version >= '8'"
+  when: "ansible_distribution_major_version|int >= 8"
+  check_mode: no
   register: check_mk_socket_unit
 
 - name: install systemd socket unit files
   tags:
+    - check_mk
     - packages
     - systemd
   template: >
     dest=/etc/systemd/system/check_mk.socket
     group=root
-    mode=644
+    mode=0644
     owner=root
     src=check_mk.socket.j2
-  when: "check_mk_socket_unit.stat.exists == False and ansible_distribution_major_version >= '8'"
+  when: ansible_distribution_major_version|int >= 8 and not check_mk_socket_unit.stat.exists
   notify:
     - reload systemd daemon
 
 - name: install systemd service unit files
   tags:
+    - check_mk
     - packages
     - systemd
   template: >
     dest=/etc/systemd/system/check_mk@.service
     group=root
-    mode=644
+    mode=0644
     owner=root
     src=check_mk@.service.j2
-  when: "check_mk_socket_unit.stat.exists == False and ansible_distribution_major_version >= '8'"
+  when: ansible_distribution_major_version|int >= 8 and check_mk_socket_unit.stat.exists
+  notify:
+    - reload systemd daemon
+
+- name: enable xinetd configuration
+  tags:
+    - check_mk
+  lineinfile: >
+    dest=/etc/xinetd.d/check_mk
+    group=root
+    mode=0644
+    owner=root
+    regexp="^[\s]*disable[\s]*="
+    state=absent
+  when: "ansible_distribution_major_version|int < 8"
   notify:
-    - "reload systemd daemon"
+    - restart "xinetd"
 
 - meta: flush_handlers
   tags:
     - check_mk
-    - monitoring
-    - packages
-    - systemd
 
-- name: ensure "check_mk.socket" is enabled and running
+- name: ensure "check_mk.socket" is enabled and started
   tags:
     - check_mk
     - monitoring
   service: >
     enabled=yes
     name=check_mk.socket
-    state=running
-  when: "ansible_distribution_major_version >= '8'"
+    state=started
+  when: "ansible_distribution_major_version|int >= 8"