X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=AnsibleRoles.git;a=blobdiff_plain;f=roles%2Fcheck-mk-agent%2Ftasks%2Fmain.yml;h=3bfc39d66ce4e32a73e89bde19150c8cd20deba3;hp=4b36238be21c73695b212c94effc2d747c7933ea;hb=595cfa0408f0ae0d97dea0e60f4f4d9be57cb134;hpb=e7596338b946f1aad571ed83e7bb2fae0f2f9fed

diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index 4b36238..3bfc39d 100644
--- a/roles/check-mk-agent/tasks/main.yml
+++ b/roles/check-mk-agent/tasks/main.yml
@@ -1,26 +1,36 @@
 ---
 # 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=installed
+    state=present
     name={{ item }}
   with_items:
     - check-mk-agent
-    - check-mk-agent-logwatch
     - nagios-plugins-basic
 
+- name: install Debian packages for Check_MK agent (2/2)
+  tags:
+    - check_mk
+    - monitoring
+    - packages
+  apt: >
+    state=present
+    name=check-mk-agent-logwatch
+  when: "ansible_distribution_major_version|int >= 7 and ansible_distribution_major_version < '9'"
+
 - name: test for systemd unit files
   tags:
     - check_mk
     - monitoring
     - packages
   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
@@ -31,10 +41,10 @@
   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 is defined and 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 == False
   notify:
     - reload systemd daemon
 
@@ -46,13 +56,27 @@
   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 is defined and 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 == False
   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:
+    - restart "xinetd"
+
 - meta: flush_handlers
   tags:
     - check_mk
@@ -60,12 +84,12 @@
     - 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"