From e31ef7f7700786b3ba0df703e12d7d1aa115c27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Mon, 9 Oct 2023 13:32:08 +0200
Subject: [PATCH] feat: update Freshclam config & services

---
 tasks/install_clamav.yml | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/tasks/install_clamav.yml b/tasks/install_clamav.yml
index dfa9548..002f7f5 100644
--- a/tasks/install_clamav.yml
+++ b/tasks/install_clamav.yml
@@ -83,31 +83,6 @@
       DatabaseMirror database.clamav.net
       OnUpdateExecute "/usr/local/bin/refresh_rkhunter.sh"
 
-#- name: patch Freshclam service
-#  lineinfile:
-#    path: "/usr/lib/systemd/system/clamav-freshclam.service"
-#    regexp: "ExecStart="
-#    # original line ad installed by distro:
-#    # ExecStart=/usr/bin/freshclam -d --foreground=true
-#    line: "ExecStart=/usr/bin/freshclam"
-#  when: ansible_os_family == "RedHat"
-
-- name: install Freshclam timer
-  ansible.builtin.copy:
-    src: "etc/systemd/system/clamav-freshclam.timer"
-    dest: "/etc/systemd/system/clamav-freshclam.timer"
-    mode: "0644"
-  when: ansible_os_family == "RedHat"
-
-- name: start and enable Freshclam timer
-  ansible.builtin.systemd:
-    service: "clamav-freshclam.timer"
-    enabled: true
-    state: started
-  when: ansible_os_family == "RedHat"
-
-
-
 - name: configure ClamD
   ansible.builtin.blockinfile:
     name: "{{ clamav_cfg_path }}/{{ 'clamd' if ansible_os_family == 'Debian' else ansible_hostname }}.conf"
@@ -179,9 +154,12 @@
    remote_src: true
   when: ansible_os_family == "RedHat"
 
-- name: enable ClamD systemd service
+- name: enable ClamD & Freshclam systemd services
   ansible.builtin.systemd:
-    service: "clamd@{{ ansible_hostname }}.service"
+    service: "{{ item }}.service"
     enabled: true
     state: "started"
+  loop:
+    - "clamd@{{ ansible_hostname }}"
+    - "clamav-freshclam"
   when: ansible_os_family == "RedHat"
-- 
GitLab