diff --git a/data/Dockerfiles/clamd/clamd.sh b/data/Dockerfiles/clamd/clamd.sh index 42c7099d..dad1c56e 100755 --- a/data/Dockerfiles/clamd/clamd.sh +++ b/data/Dockerfiles/clamd/clamd.sh @@ -37,6 +37,9 @@ chmod 750 /run/clamav stat /var/lib/clamav/whitelist.ign2 dos2unix /var/lib/clamav/whitelist.ign2 sed -i '/^\s*$/d' /var/lib/clamav/whitelist.ign2 +# Copying to /etc/clamav to expose file as-is to administrator +cp -p /var/lib/clamav/whitelist.ign2 /etc/clamav/whitelist.ign2 + BACKGROUND_TASKS=() diff --git a/data/conf/clamav/whitelist.ign2 b/data/conf/clamav/whitelist.ign2 deleted file mode 100644 index f961b045..00000000 --- a/data/conf/clamav/whitelist.ign2 +++ /dev/null @@ -1,3 +0,0 @@ -# Please restart ClamAV after changing signatures -Example-Signature.Ignore-1 -PUA.Pdf.Trojan.EmbeddedJavaScript-1 diff --git a/docker-compose.yml b/docker-compose.yml index 2fc1fd2d..1e88b099 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,7 +62,6 @@ services: - TZ=${TZ} - SKIP_CLAMD=${SKIP_CLAMD:-n} volumes: - - ./data/conf/clamav/whitelist.ign2:/var/lib/clamav/whitelist.ign2 - ./data/conf/clamav/:/etc/clamav/ networks: mailcow-network: