Update antivirus.conf to check for 'no' in SKIP_CLAMD

_modules/scripts/migrate_options.sh

@@ -14,7 +14,6 @@ migrate_config_options() {
     FLATCURVE_EXPERIMENTAL
     DISABLE_IPv6
     ACME_CONTACT
-    SOGO_URL_ENCRYPTION_KEY
   )
 
   for key in "${KEYS[@]}"; do
@@ -63,12 +62,6 @@ migrate_config_options() {
           sed -i '/^ACME_CONTACT=.*/d' mailcow.conf
           sed -i '/^#ACME_CONTACT=.*/d' mailcow.conf
           ;;
-        SOGO_URL_ENCRYPTION_KEY)
-          echo "Removing ${key} in mailcow.conf (moved to sogo.conf)"
-          sed -i '/^# SOGo URL encryption key/d' mailcow.conf
-          sed -i '/^# This key is used to encrypt email addresses within SOGo URLs/d' mailcow.conf
-          sed -i '/^SOGO_URL_ENCRYPTION_KEY=.*/d' mailcow.conf
-          ;;
       esac
     fi
   done

_modules/scripts/new_options.sh

@@ -43,6 +43,7 @@ adapt_new_options() {
   "ALLOW_ADMIN_EMAIL_LOGIN"
   "SKIP_HTTP_VERIFICATION"
   "SOGO_EXPIRE_SESSION"
+  "SOGO_URL_ENCRYPTION_KEY"
   "REDIS_PORT"
   "REDISPASS"
   "DOVECOT_MASTER_USER"
@@ -286,6 +287,11 @@ adapt_new_options() {
         REDISPASS)
             echo "REDISPASS=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 28)" >> mailcow.conf
             ;;
+        SOGO_URL_ENCRYPTION_KEY)
+            echo '# SOGo URL encryption key (exactly 16 characters, limited to A–Z, a–z, 0–9)' >> mailcow.conf
+            echo '# This key is used to encrypt email addresses within SOGo URLs' >> mailcow.conf
+            echo "SOGO_URL_ENCRYPTION_KEY=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 16)" >> mailcow.conf
+            ;;
         *)
             echo "${option}=" >> mailcow.conf
             ;;

data/conf/rspamd/local.d/antivirus.conf

@@ -1,3 +1,4 @@
+{%- if env.SKIP_CLAMD == "n" or env.SKIP_CLAMD == "no" -%}
 clamav {
   # Scan whole message
   scan_mime_parts = false;
@@ -9,3 +10,4 @@ clamav {
   servers = "clamd:3310";
   max_size = 20971520;
 }
+{% endif %}

docker-compose.yml

@@ -97,6 +97,7 @@ services:
         - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
         - REDISPASS=${REDISPASS}
         - SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
+        - RSPAMD_SKIP_CLAMD=${SKIP_CLAMD:-n}
       volumes:
         - ./data/hooks/rspamd:/hooks:Z
         - ./data/conf/rspamd/custom/:/etc/rspamd/custom:z
@@ -213,6 +214,7 @@ services:
         - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
         - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
         - SOGO_EXPIRE_SESSION=${SOGO_EXPIRE_SESSION:-480}
+        - SOGO_URL_ENCRYPTION_KEY=${SOGO_URL_ENCRYPTION_KEY:-SOGoSuperSecret0}
         - SKIP_SOGO=${SKIP_SOGO:-n}
         - MASTER=${MASTER:-y}
         - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}

generate_config.sh

@@ -405,6 +405,10 @@ MAILDIR_SUB=Maildir
 # SOGo session timeout in minutes
 SOGO_EXPIRE_SESSION=480
 
+# SOGo URL encryption key (exactly 16 characters, limited to A–Z, a–z, 0–9)
+# This key is used to encrypt email addresses within SOGo URLs
+SOGO_URL_ENCRYPTION_KEY=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 16)
+
 # DOVECOT_MASTER_USER and DOVECOT_MASTER_PASS must both be provided. No special chars.
 # Empty by default to auto-generate master user and password on start.
 # User expands to DOVECOT_MASTER_USER@mailcow.local