X-Git-Url: https://arthur.barton.de/gitweb/?p=AnsibleRoles.git;a=blobdiff_plain;f=roles%2Fcheck-mk-agent%2Ftasks%2Fmain.yml;h=0e59f1872966e856cd080eae8c561d8bd08d2dac;hp=af00a038e41ec2132f83008a57107177982d032e;hb=5f47f907a327eee91e9096e1943dbad0b36a574e;hpb=5c7a0e7133ca24fd76ff232bee1a9002371129f1

diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index af00a03..0e59f18 100644
--- a/roles/check-mk-agent/tasks/main.yml
+++ b/roles/check-mk-agent/tasks/main.yml
@@ -1,26 +1,37 @@
 ---
 # 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
-    - nagios-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
@@ -31,10 +42,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,10 +57,10 @@
   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
 
@@ -59,27 +70,24 @@
   lineinfile: >
     dest=/etc/xinetd.d/check_mk
     group=root
-    mode=644
+    mode=0644
     owner=root
     regexp="^[\s]*disable[\s]*="
     state=absent
-  when: "ansible_distribution_major_version < '8'"
+  when: "ansible_distribution_major_version|int < 8"
   notify:
     - 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"