Browse Source

[ClamAV] Copy productive whitelist.ign to exposed configuration folder, remove direct mount of whitelist file

andryyy 5 years ago
parent
commit
8c3ab0371a
3 changed files with 3 additions and 4 deletions
  1. 3 0
      data/Dockerfiles/clamd/clamd.sh
  2. 0 3
      data/conf/clamav/whitelist.ign2
  3. 0 1
      docker-compose.yml

+ 3 - 0
data/Dockerfiles/clamd/clamd.sh

@@ -37,6 +37,9 @@ chmod 750 /run/clamav
 stat /var/lib/clamav/whitelist.ign2
 stat /var/lib/clamav/whitelist.ign2
 dos2unix /var/lib/clamav/whitelist.ign2
 dos2unix /var/lib/clamav/whitelist.ign2
 sed -i '/^\s*$/d' /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=()
 BACKGROUND_TASKS=()
 
 

+ 0 - 3
data/conf/clamav/whitelist.ign2

@@ -1,3 +0,0 @@
-# Please restart ClamAV after changing signatures
-Example-Signature.Ignore-1
-PUA.Pdf.Trojan.EmbeddedJavaScript-1

+ 0 - 1
docker-compose.yml

@@ -62,7 +62,6 @@ services:
         - TZ=${TZ}
         - TZ=${TZ}
         - SKIP_CLAMD=${SKIP_CLAMD:-n}
         - SKIP_CLAMD=${SKIP_CLAMD:-n}
       volumes:
       volumes:
-        - ./data/conf/clamav/whitelist.ign2:/var/lib/clamav/whitelist.ign2
         - ./data/conf/clamav/:/etc/clamav/
         - ./data/conf/clamav/:/etc/clamav/
       networks:
       networks:
         mailcow-network:
         mailcow-network: