X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=roles%2Fcheck-mk-agent%2Ftasks%2Fmain.yml;h=988ad3fc22b37d5e55ff2bf59e38b3249687e4a3;hb=HEAD;hp=6b9b52ea067074024df5faf8f3ac26b44e42ea4a;hpb=4282af2f7a17d3808b6f4c12e8e2472799160d41;p=AnsibleRoles.git

diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index 6b9b52e..988ad3f 100644
--- a/roles/check-mk-agent/tasks/main.yml
+++ b/roles/check-mk-agent/tasks/main.yml
@@ -1,58 +1,27 @@
 ---
 # tasks file for check-mk-agent
 
-- name: install Debian packages for Check_MK agent
+- name: install Debian packages for Check_MK agent (1/2)
   tags:
     - check_mk
     - monitoring
     - packages
-  apt: >
-    state=installed
-    name={{ item }}
-  with_items:
-    - check-mk-agent
-    - check-mk-agent-logwatch
-    - nagios-plugins-basic
+  apt:
+    state: present
+    name: [
+      'check-mk-agent',
+      'monitoring-plugins-basic',
+    ]
 
-- name: test for systemd unit files
+- name: install Debian packages for Check_MK agent (2/2)
   tags:
     - check_mk
     - monitoring
     - packages
-  stat: path=/etc/systemd/system/check_mk.socket
-  when: "ansible_distribution_major_version >= '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
-    owner=root
-    src=check_mk.socket.j2
-  when: ansible_distribution_major_version >= '8' and check_mk_socket_unit.stat.exists == False
-  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
-    owner=root
-    src=check_mk@.service.j2
-  when: ansible_distribution_major_version >= '8' and check_mk_socket_unit.stat.exists == False
-  notify:
-    - reload systemd daemon
+  apt: >
+    state=present
+    name=check-mk-agent-logwatch
+  when: "ansible_distribution_major_version|int >= 7 and ansible_distribution_major_version|int < 9"
 
 - name: enable xinetd configuration
   tags:
@@ -60,20 +29,17 @@
   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 started
   tags:
@@ -83,4 +49,4 @@
     enabled=yes
     name=check_mk.socket
     state=started
-  when: "ansible_distribution_major_version >= '8'"
+  when: "ansible_distribution_major_version|int >= 8"