Update rebuild_backup_image.yml

.github/workflows/rebuild_backup_image.yml

@@ -29,6 +29,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           file: data/Dockerfiles/backup/Dockerfile
           push: true
           tags: mailcow/backup:latest

.gitignore

@@ -36,7 +36,6 @@ data/conf/postfix/extra.cf
 data/conf/postfix/sni.map
 data/conf/postfix/sni.map.db
 data/conf/postfix/sql
-data/conf/postfix/dns_blocklists.cf
 data/conf/rspamd/custom/*
 data/conf/rspamd/local.d/*
 data/conf/rspamd/override.d/*

data/Dockerfiles/postfix/Dockerfile

@@ -33,7 +33,6 @@ RUN groupadd -g 102 postfix \
 	syslog-ng-core \
 	syslog-ng-mod-redis \
   tzdata \
-    whois \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& touch /etc/default/locale \
   && printf '#!/bin/bash\n/usr/sbin/postconf -c /opt/postfix/conf "$@"' > /usr/local/sbin/postconf \

data/Dockerfiles/postfix/postfix.sh

@@ -393,111 +393,6 @@ query = SELECT goto FROM spamalias
     AND validity >= UNIX_TIMESTAMP()
 EOF
 
-if [ -n "$SPAMHAUS_DQS_KEY" ]; then
-  echo -e "\e[32mDetected SPAMHAUS_DQS_KEY variable from mailcow.conf...\e[0m"
-  echo -e "\e[33mUsing DQS Blocklists from Spamhaus!\e[0m"
-  cat <<EOF > /opt/postfix/conf/dns_blocklists.cf
-    # Autogenerated by mailcow
-    postscreen_dnsbl_sites = wl.mailspike.net=127.0.0.[18;19;20]*-2
-      hostkarma.junkemailfilter.com=127.0.0.1*-2
-      list.dnswl.org=127.0.[0..255].0*-2
-      list.dnswl.org=127.0.[0..255].1*-4
-      list.dnswl.org=127.0.[0..255].2*-6
-      list.dnswl.org=127.0.[0..255].3*-8
-      ix.dnsbl.manitu.net*2
-      bl.spamcop.net*2
-      bl.suomispam.net*2
-      hostkarma.junkemailfilter.com=127.0.0.2*3
-      hostkarma.junkemailfilter.com=127.0.0.4*2
-      hostkarma.junkemailfilter.com=127.0.1.2*1
-      backscatter.spameatingmonkey.net*2
-      bl.ipv6.spameatingmonkey.net*2
-      bl.spameatingmonkey.net*2
-      b.barracudacentral.org=127.0.0.2*7
-      bl.mailspike.net=127.0.0.2*5
-      bl.mailspike.net=127.0.0.[10;11;12]*4
-      dnsbl.sorbs.net=127.0.0.10*8
-      dnsbl.sorbs.net=127.0.0.5*6
-      dnsbl.sorbs.net=127.0.0.7*3
-      dnsbl.sorbs.net=127.0.0.8*2
-      dnsbl.sorbs.net=127.0.0.6*2
-      dnsbl.sorbs.net=127.0.0.9*2
-      ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net=127.0.0.[4..7]*6
-      ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.org=127.0.0.[10;11]*8
-      ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.org=127.0.0.3*4
-      ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.org=127.0.0.2*3
-      ${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net=127.0.0.3*4
-      ${SPAMHAUS_DQS_KEY}.zrd.dq.spamhaus.net=127.0.0.2*3
-EOF
-
-else
-  if curl -s http://fuzzy.mailcow.email/asn_list.txt | grep $(whois -h whois.radb.net $(curl -s http://ipv4.mailcow.email) | grep -i origin | tr -s " " | cut -d " " -f2 | head -1) > /dev/null; then
-  echo -e "\e[31mThe AS of your IP is listed as a banned AS from Spamhaus!\e[0m"
-  echo -e "\e[33mNo SPAMHAUS_DQS_KEY found... Skipping Spamhaus blocklists entirely!\e[0m"
-  cat <<EOF > /opt/postfix/conf/dns_blocklists.cf
-    # Autogenerated by mailcow
-    postscreen_dnsbl_sites = wl.mailspike.net=127.0.0.[18;19;20]*-2
-      hostkarma.junkemailfilter.com=127.0.0.1*-2
-      list.dnswl.org=127.0.[0..255].0*-2
-      list.dnswl.org=127.0.[0..255].1*-4
-      list.dnswl.org=127.0.[0..255].2*-6
-      list.dnswl.org=127.0.[0..255].3*-8
-      ix.dnsbl.manitu.net*2
-      bl.spamcop.net*2
-      bl.suomispam.net*2
-      hostkarma.junkemailfilter.com=127.0.0.2*3
-      hostkarma.junkemailfilter.com=127.0.0.4*2
-      hostkarma.junkemailfilter.com=127.0.1.2*1
-      backscatter.spameatingmonkey.net*2
-      bl.ipv6.spameatingmonkey.net*2
-      bl.spameatingmonkey.net*2
-      b.barracudacentral.org=127.0.0.2*7
-      bl.mailspike.net=127.0.0.2*5
-      bl.mailspike.net=127.0.0.[10;11;12]*4
-      dnsbl.sorbs.net=127.0.0.10*8
-      dnsbl.sorbs.net=127.0.0.5*6
-      dnsbl.sorbs.net=127.0.0.7*3
-      dnsbl.sorbs.net=127.0.0.8*2
-      dnsbl.sorbs.net=127.0.0.6*2
-      dnsbl.sorbs.net=127.0.0.9*2
-EOF
-  else
-  echo -e "\e[32mThe AS of your IP is NOT listed as a banned AS from Spamhaus!\e[0m"
-  echo -e "\e[33mUsing the open Spamhaus blocklists.\e[0m"
-  cat <<EOF > /opt/postfix/conf/dns_blocklists.cf
-    # Autogenerated by mailcow
-    postscreen_dnsbl_sites = wl.mailspike.net=127.0.0.[18;19;20]*-2
-      hostkarma.junkemailfilter.com=127.0.0.1*-2
-      list.dnswl.org=127.0.[0..255].0*-2
-      list.dnswl.org=127.0.[0..255].1*-4
-      list.dnswl.org=127.0.[0..255].2*-6
-      list.dnswl.org=127.0.[0..255].3*-8
-      ix.dnsbl.manitu.net*2
-      bl.spamcop.net*2
-      bl.suomispam.net*2
-      hostkarma.junkemailfilter.com=127.0.0.2*3
-      hostkarma.junkemailfilter.com=127.0.0.4*2
-      hostkarma.junkemailfilter.com=127.0.1.2*1
-      backscatter.spameatingmonkey.net*2
-      bl.ipv6.spameatingmonkey.net*2
-      bl.spameatingmonkey.net*2
-      b.barracudacentral.org=127.0.0.2*7
-      bl.mailspike.net=127.0.0.2*5
-      bl.mailspike.net=127.0.0.[10;11;12]*4
-      dnsbl.sorbs.net=127.0.0.10*8
-      dnsbl.sorbs.net=127.0.0.5*6
-      dnsbl.sorbs.net=127.0.0.7*3
-      dnsbl.sorbs.net=127.0.0.8*2
-      dnsbl.sorbs.net=127.0.0.6*2
-      dnsbl.sorbs.net=127.0.0.9*2
-      zen.spamhaus.org=127.0.0.[10;11]*8
-      zen.spamhaus.org=127.0.0.[4..7]*6
-      zen.spamhaus.org=127.0.0.3*4
-      zen.spamhaus.org=127.0.0.2*3
-EOF
-  fi
-fi
-
 sed -i '/User overrides/q' /opt/postfix/conf/main.cf
 echo >> /opt/postfix/conf/main.cf
 touch /opt/postfix/conf/extra.cf

data/conf/postfix/main.cf

@@ -40,6 +40,34 @@ postscreen_blacklist_action = drop
 postscreen_cache_cleanup_interval = 24h
 postscreen_cache_map = proxy:btree:$data_directory/postscreen_cache
 postscreen_dnsbl_action = enforce
+postscreen_dnsbl_sites = wl.mailspike.net=127.0.0.[18;19;20]*-2
+  hostkarma.junkemailfilter.com=127.0.0.1*-2
+  list.dnswl.org=127.0.[0..255].0*-2
+  list.dnswl.org=127.0.[0..255].1*-4
+  list.dnswl.org=127.0.[0..255].2*-6
+  list.dnswl.org=127.0.[0..255].3*-8
+  ix.dnsbl.manitu.net*2
+  bl.spamcop.net*2
+  bl.suomispam.net*2
+  hostkarma.junkemailfilter.com=127.0.0.2*3
+  hostkarma.junkemailfilter.com=127.0.0.4*2
+  hostkarma.junkemailfilter.com=127.0.1.2*1
+  backscatter.spameatingmonkey.net*2
+  bl.ipv6.spameatingmonkey.net*2
+  bl.spameatingmonkey.net*2
+  b.barracudacentral.org=127.0.0.2*7
+  bl.mailspike.net=127.0.0.2*5
+  bl.mailspike.net=127.0.0.[10;11;12]*4
+  dnsbl.sorbs.net=127.0.0.10*8
+  dnsbl.sorbs.net=127.0.0.5*6
+  dnsbl.sorbs.net=127.0.0.7*3
+  dnsbl.sorbs.net=127.0.0.8*2
+  dnsbl.sorbs.net=127.0.0.6*2
+  dnsbl.sorbs.net=127.0.0.9*2
+  zen.spamhaus.org=127.0.0.[10;11]*8
+  zen.spamhaus.org=127.0.0.[4..7]*6
+  zen.spamhaus.org=127.0.0.3*4
+  zen.spamhaus.org=127.0.0.2*3
 postscreen_dnsbl_threshold = 6
 postscreen_dnsbl_ttl = 5m
 postscreen_greet_action = enforce

data/web/api/openapi.yaml

@@ -5602,50 +5602,6 @@ paths:
       description: You can list all mailboxes existing in system for a specific domain.
       operationId: Get mailboxes of a domain
       summary: Get mailboxes of a domain
-  /api/v1/edit/cors:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - type: "success"
-                      log: ["cors", "edit", {"allowed_origins": ["*", "mail.mailcow.tld"], "allowed_methods": ["POST", "GET", "DELETE", "PUT"]}]
-                      msg: "cors_headers_edited"
-          description: OK
-          headers: { }
-      tags:
-        - Cross-Origin Resource Sharing (CORS)
-      description: >-
-        This endpoint allows you to manage Cross-Origin Resource Sharing (CORS) settings for the API. 
-        CORS is a security feature implemented by web browsers to prevent unauthorized cross-origin requests. 
-        By editing the CORS settings, you can specify which domains and which methods are permitted to access the API resources from outside the mailcow domain.
-      operationId: Edit Cross-Origin Resource Sharing (CORS) settings
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                attr:
-                  allowed_origins: ["*", "mail.mailcow.tld"]
-                  allowed_methods: ["POST", "GET", "DELETE", "PUT"]
-              properties:
-                attr:
-                  type: object
-                  properties:
-                    allowed_origins:
-                      type: array
-                      items:
-                        type: string
-                    allowed_methods:
-                      type: array
-                      items:
-                        type: string
-      summary: Edit Cross-Origin Resource Sharing (CORS) settings
 
 tags:
   - name: Domains
@@ -5690,5 +5646,3 @@ tags:
     description: Get the status of your cow
   - name: Ratelimits
     description: Edit domain ratelimits
-  - name: Cross-Origin Resource Sharing (CORS)
-    description: Manage Cross-Origin Resource Sharing (CORS) settings

data/web/templates/admin/tab-config-f2b.twig

@@ -92,16 +92,16 @@
       {% endif %}
       {% for active_ban in f2b_data.active_bans %}
         <p>
-          <span class="badge fs-5 bg-info py-0">
+          <span class="badge fs-5 bg-info" style="padding:4px;font-size:85%;">
             <i class="bi bi-funnel-fill"></i>
             <a href="https://bgp.he.net/ip/{{ active_ban.ip }}" target="_blank" style="color:white">
               {{ active_ban.network }}
             </a>
             ({{ active_ban.banned_until }}) -
             {% if active_ban.queued_for_unban == 0 %}
-            <a class="btn btn-lg btn-link p-0 text-info" data-action="edit_selected" data-item="{{ active_ban.network }}" data-id="f2b-quick" data-api-url='edit/fail2ban' data-api-attr='{"action":"unban"}' href="#">[{{ lang.admin.queue_unban }}]</a>
+            <a data-action="edit_selected" data-item="{{ active_ban.network }}" data-id="f2b-quick" data-api-url='edit/fail2ban' data-api-attr='{"action":"unban"}' href="#">[{{ lang.admin.queue_unban }}]</a>
-            <a class="btn btn-lg btn-link p-0 text-info" data-action="edit_selected" data-item="{{ active_ban.network }}" data-id="f2b-quick" data-api-url='edit/fail2ban' data-api-attr='{"action":"whitelist"}' href="#">[whitelist]</a>
+            <a data-action="edit_selected" data-item="{{ active_ban.network }}" data-id="f2b-quick" data-api-url='edit/fail2ban' data-api-attr='{"action":"whitelist"}' href="#">[whitelist]</a>
-            <a class="btn btn-lg btn-link p-0 text-info" data-action="edit_selected" data-item="{{ active_ban.network }}" data-id="f2b-quick" data-api-url='edit/fail2ban' data-api-attr='{"action":"blacklist"}' href="#">[blacklist (<b>needs restart</b>)]</a>
+            <a data-action="edit_selected" data-item="{{ active_ban.network }}" data-id="f2b-quick" data-api-url='edit/fail2ban' data-api-attr='{"action":"blacklist"}' href="#">[blacklist (<b>needs restart</b>)]</a>
             {% else %}
             <i>{{ lang.admin.unban_pending }}</i>
             {% endif %}

data/web/templates/user/tab-user-details.twig

@@ -46,7 +46,7 @@
         <div class="col-sm-8 col-md-9 col-12">
           <p>
             {% if user_get_alias_details.aliases_also_send_as == '*' %}
-              {{ lang.user.sender_acl_disabled | raw }}
+              {{ lang.user.sender_acl_disabled }}
             {% elseif user_get_alias_details.aliases_also_send_as %}
               {{ user_get_alias_details.aliases_also_send_as }}
             {% else %}
@@ -58,13 +58,13 @@
       <div class="row">
         <div class="col-sm-4 col-md-3 col-12 text-sm-end text-start mb-4">{{ lang.user.aliases_send_as_all }}:</div>
         <div class="col-sm-8 col-md-9 col-12">
-          <p>{% if not user_get_alias_details.aliases_send_as_all %}<i class="bi bi-x-lg"></i>{% else %}{{ user_get_alias_details.aliases_send_as_all }}{% endif %}</p>
+          <p>{% if not user_get_alias_details.aliases_send_as_all %}<i class="bi bi-x-lg"></i>{% endif %}</p>
         </div>
       </div>
       <div class="row">
         <div class="col-sm-4 col-md-3 col-12 text-sm-end text-start mb-4">{{ lang.user.is_catch_all }}:</div>
         <div class="col-sm-8 col-md-9 col-12">
-          <p>{% if not user_get_alias_details.is_catch_all %}<i class="bi bi-x-lg"></i>{% else %}{{ user_get_alias_details.is_catch_all }}{% endif %}</p>
+          <p>{% if not user_get_alias_details.is_catch_all %}<i class="bi bi-x-lg"></i>{% endif %}</p>
         </div>
       </div>
     </div>

docker-compose.yml

@@ -297,7 +297,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: mailcow/postfix:1.69
+      image: mailcow/postfix:1.68
       depends_on:
         - mysql-mailcow
       volumes:
@@ -317,7 +317,6 @@ services:
         - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
         - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
-        - SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
       cap_add:
         - NET_BIND_SERVICE
       ports:
@@ -512,7 +511,7 @@ services:
             - watchdog
 
     dockerapi-mailcow:
-      image: mailcow/dockerapi:2.05
+      image: mailcow/dockerapi:2.04
       security_opt:
         - label=disable
       restart: always

generate_config.sh

@@ -21,7 +21,7 @@ if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusyBox grep
 if cp --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusyBox cp detected, please install coreutils, \"apk add --no-cache --upgrade coreutils\""; exit 1; fi
 if sed --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusyBox sed detected, please install gnu sed, \"apk add --no-cache --upgrade sed\""; exit 1; fi
 
-for bin in openssl curl docker git awk sha1sum grep cut whois; do
+for bin in openssl curl docker git awk sha1sum; do
   if [[ -z $(which ${bin}) ]]; then echo "Cannot find ${bin}, exiting..."; exit 1; fi
 done
 
@@ -58,23 +58,6 @@ else
   exit 1
 fi
 
-detect_bad_asn() {
-  if [[ curl -s http://fuzzy.mailcow.email/asn_list.txt |  grep $(whois -h whois.radb.net $(curl -s http://ipv4.mailcow.email) | grep -i origin | tr -s " " | cut -d " " -f2 | head -1) ]]; then
-    if ! $SPAMHAUS_DQS_KEY; then
-      echo -e "\e[31mYour server's public IP uses an AS that is blocked by Spamhaus to use their DNS blocklists for Postfix."
-      echo -e "\e[31mmailcow did not detected a value for the variable SPAMHAUS_DQS_KEY inside mailcow.conf!"
-      echo ""
-      echo -e "\e[31mTo use the Spamhaus DNS Blocklists again, you will need to create a FREE account for their Data Query Service (DQS) at: https://www.spamhaus.com/free-trial/sign-up-for-a-free-data-query-service-account"
-      echo -e "\e[31mOnce done, enter your DQS API key in mailcow.conf and mailcow will do the rest for you!"
-      sleep 2
-
-    else
-      echo -e "\e[31mYour server's public IP uses an AS that is blocked by Spamhaus to use their DNS blocklists for Postfix."
-      echo -e "\e[33mmailcow detected a Value for the variable SPAMHAUS_DQS_KEY inside mailcow.conf. Postfix will use DQS with the given API key..."
-    fi
-  fi
-}
-
 ### If generate_config.sh is started with --dev or -d it will not check out nightly or master branch and will keep on the current branch
 if [[ ${1} == "--dev" || ${1} == "-d" ]]; then
   SKIP_BRANCH=y
@@ -448,13 +431,6 @@ ACME_CONTACT=
 # root certificates can be placed for validation under mailcow-dockerized/data/web/inc/lib/WebAuthn/rootCertificates
 WEBAUTHN_ONLY_TRUSTED_VENDORS=n
 
-# Spamhaus Data Query Service Key
-# Optional: Leave empty for none
-# Enter your key here if you are using a blocked ASN (OVH, AWS, Cloudflare e.g) for the unregistered Spamhaus Blocklist. 
-# If empty, it will completely disable Spamhaus blocklists if it detects that you are running on a server using a blocked AS.
-# Otherwise it will work normally.
-SPAMHAUS_DQS_KEY=
-
 EOF
 
 mkdir -p data/assets/ssl
@@ -527,5 +503,3 @@ else
   echo '?>' >> data/web/inc/app_info.inc.php
   echo -e "\e[33mCannot determine current git repository version...\e[0m"
 fi
-
-detect_bad_asn

update.sh

@@ -255,25 +255,6 @@ elif [ "${DOCKER_COMPOSE_VERSION}" == "standalone" ]; then
 fi
 }
 
-detect_bad_asn() {
-  if curl -s http://fuzzy.mailcow.email/asn_list.txt | grep $(whois -h whois.radb.net $(curl -s http://ipv4.mailcow.email) | grep -i origin | tr -s " " | cut -d " " -f2 | head -1) > /dev/null ; then
-    if [ -z "$SPAMHAUS_DQS_KEY" ]; then
-      echo -e "\e[33mYour server's public IP uses an AS that is blocked by Spamhaus to use their DNS public blocklists for Postfix.\e[0m"
-      echo -e "\e[33mmailcow did not detected a value for the variable SPAMHAUS_DQS_KEY inside mailcow.conf!\e[0m"
-      sleep 2
-      echo ""
-      echo -e "\e[33mTo use the Spamhaus DNS Blocklists again, you will need to create a FREE account for their Data Query Service (DQS) at: https://www.spamhaus.com/free-trial/sign-up-for-a-free-data-query-service-account\e[0m"
-      echo -e "\e[33mOnce done, enter your DQS API key in mailcow.conf and mailcow will do the rest for you!\e[0m"
-      echo ""
-      sleep 2
-
-    else
-      echo -e "\e[33mYour server's public IP uses an AS that is blocked by Spamhaus to use their DNS public blocklists for Postfix.\e[0m"
-      echo -e "\e[32mmailcow detected a Value for the variable SPAMHAUS_DQS_KEY inside mailcow.conf. Postfix will use DQS with the given API key...\e[0m"
-    fi
-  fi
-}
-
 ############## End Function Section ##############
 
 # Check permissions
@@ -320,7 +301,7 @@ umask 0022
 unset COMPOSE_COMMAND
 unset DOCKER_COMPOSE_VERSION
 
-for bin in curl docker git awk sha1sum grep cut whois; do
+for bin in curl docker git awk sha1sum; do
   if [[ -z $(command -v ${bin}) ]]; then 
   echo "Cannot find ${bin}, exiting..." 
   exit 1;
@@ -461,11 +442,8 @@ CONFIG_ARRAY=(
   "ACME_CONTACT"
   "WATCHDOG_VERBOSE"
   "WEBAUTHN_ONLY_TRUSTED_VENDORS"
-  "SPAMHAUS_DQS_KEY"
 )
 
-detect_bad_asn
-
 sed -i --follow-symlinks '$a\' mailcow.conf
 for option in ${CONFIG_ARRAY[@]}; do
   if [[ ${option} == "ADDITIONAL_SAN" ]]; then
@@ -664,7 +642,6 @@ for option in ${CONFIG_ARRAY[@]}; do
     fi
   elif [[ ${option} == "ADDITIONAL_SERVER_NAMES" ]]; then
     if ! grep -q ${option} mailcow.conf; then
-      echo "Adding new option \"${option}\" to mailcow.conf"
       echo '# Additional server names for mailcow UI' >> mailcow.conf
       echo '#' >> mailcow.conf
       echo '# Specify alternative addresses for the mailcow UI to respond to' >> mailcow.conf
@@ -676,7 +653,6 @@ for option in ${CONFIG_ARRAY[@]}; do
     fi
   elif [[ ${option} == "ACME_CONTACT" ]]; then
     if ! grep -q ${option} mailcow.conf; then
-      echo "Adding new option \"${option}\" to mailcow.conf"
       echo '# Lets Encrypt registration contact information' >> mailcow.conf
       echo '# Optional: Leave empty for none' >> mailcow.conf
       echo '# This value is only used on first order!' >> mailcow.conf
@@ -686,25 +662,13 @@ for option in ${CONFIG_ARRAY[@]}; do
   fi
   elif [[ ${option} == "WEBAUTHN_ONLY_TRUSTED_VENDORS" ]]; then
     if ! grep -q ${option} mailcow.conf; then
-      echo "Adding new option \"${option}\" to mailcow.conf"
       echo "# WebAuthn device manufacturer verification" >> mailcow.conf
       echo '# After setting WEBAUTHN_ONLY_TRUSTED_VENDORS=y only devices from trusted manufacturers are allowed' >> mailcow.conf
       echo '# root certificates can be placed for validation under mailcow-dockerized/data/web/inc/lib/WebAuthn/rootCertificates' >> mailcow.conf
       echo 'WEBAUTHN_ONLY_TRUSTED_VENDORS=n' >> mailcow.conf
     fi
-  elif [[ ${option} == "SPAMHAUS_DQS_KEY" ]]; then
-    if ! grep -q ${option} mailcow.conf; then
-      echo "Adding new option \"${option}\" to mailcow.conf"
-      echo "# Spamhaus Data Query Service Key" >> mailcow.conf
-      echo '# Optional: Leave empty for none' >> mailcow.conf
-      echo '# Enter your key here if you are using a blocked ASN (OVH, AWS, Cloudflare e.g) for the unregistered Spamhaus Blocklist.' >> mailcow.conf
-      echo '# If empty, it will completely disable Spamhaus blocklists if it detects that you are running on a server using a blocked AS.' >> mailcow.conf
-      echo '# Otherwise it will work as usual.' >> mailcow.conf
-      echo 'SPAMHAUS_DQS_KEY=' >> mailcow.conf
-    fi
 elif [[ ${option} == "WATCHDOG_VERBOSE" ]]; then
     if ! grep -q ${option} mailcow.conf; then
-      echo "Adding new option \"${option}\" to mailcow.conf"
       echo '# Enable watchdog verbose logging' >> mailcow.conf
       echo 'WATCHDOG_VERBOSE=n' >> mailcow.conf
   fi