From 33f99de4fe5ad469cdb128e99c1949a5b46d7580 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Tue, 13 Jul 2021 05:03:40 +0000
Subject: [PATCH] Ensure the quarantine directory exists

---
 defaults/main.yml                                         | 2 ++
 tasks/main.yml                                            | 8 ++++++++
 .../34/usr/lib/systemd/system/clamav-clamonacc.service    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 616a3ab..b70c441 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
 # defaults file for ensure_clamav
+quarantine_directory: '/root/quarantine'
+
diff --git a/tasks/main.yml b/tasks/main.yml
index a174aba..0920776 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -74,6 +74,14 @@
   loop: '{{ ensure_clamav.seboolean_list }}'
   loop_control:
     label: '{{ item.name }} will be {{ item.state }}'
+- name: 'ensure quarantine directory'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_clamav is defined
+    - quarantine_directory is defined
+  ansible.builtin.file:
+    path: '{{ quarantine_directory }}'
+    state: 'directory'
 - name: 'ensure configurations'
   when:
     - ansible_system == 'Linux'
diff --git a/templates/Fedora/34/usr/lib/systemd/system/clamav-clamonacc.service b/templates/Fedora/34/usr/lib/systemd/system/clamav-clamonacc.service
index fd6ee6b..7b98ccd 100644
--- a/templates/Fedora/34/usr/lib/systemd/system/clamav-clamonacc.service
+++ b/templates/Fedora/34/usr/lib/systemd/system/clamav-clamonacc.service
@@ -9,7 +9,7 @@ After=clamd@scan.service syslog.target network.target
 [Service]
 Type=simple
 User=root
-ExecStart=/usr/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf --move=/root/quarantine/ --fdpass
+ExecStart=/usr/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf --move={{ quarantine_directory }} --fdpass
 
 [Install]
 WantedBy=multi-user.target