瀏覽代碼

Move sed cmd to remove discontinued DNSBLs (#6315)

* Move sed cmd to remove discontinued DNSBLs

* compose: bump postfix version

---------

Co-authored-by: DerLinkman <niklas.meyer@servercow.de>
Peter 6 月之前
父節點
當前提交
7bce5d836b
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 4 3
      data/Dockerfiles/postfix/postfix.sh
  2. 1 1
      docker-compose.yml

+ 4 - 3
data/Dockerfiles/postfix/postfix.sh

@@ -416,10 +416,11 @@ postscreen_dnsbl_sites = wl.mailspike.net=127.0.0.[18;19;20]*-2
   bl.mailspike.net=127.0.0.[10;11;12]*4
   bl.mailspike.net=127.0.0.[10;11;12]*4
 EOF
 EOF
 fi
 fi
-DNSBL_CONFIG=$(grep -v '^#' /opt/postfix/conf/dns_blocklists.cf | grep '\S')
 
 
-# Remove discontinued Nixspam DNSBL from existing dns_blocklists.cf
-sed -i '/ix\.dnsbl\.manitu\.net\*2/d' /opt/postfix/conf/dns_blocklists.cf
+# Remove discontinued DNSBLs from existing dns_blocklists.cf
+sed -i '/ix\.dnsbl\.manitu\.net\*2/d' /opt/postfix/conf/dns_blocklists.cf # Nixspam
+
+DNSBL_CONFIG=$(grep -v '^#' /opt/postfix/conf/dns_blocklists.cf | grep '\S')
 
 
 if [ ! -z "$DNSBL_CONFIG" ]; then
 if [ ! -z "$DNSBL_CONFIG" ]; then
   echo -e "\e[33mChecking if ASN for your IP is listed for Spamhaus Bad ASN List...\e[0m"
   echo -e "\e[33mChecking if ASN for your IP is listed for Spamhaus Bad ASN List...\e[0m"

+ 1 - 1
docker-compose.yml

@@ -321,7 +321,7 @@ services:
             - dovecot
             - dovecot
 
 
     postfix-mailcow:
     postfix-mailcow:
-      image: mailcow/postfix:1.79
+      image: mailcow/postfix:1.80
       depends_on:
       depends_on:
         mysql-mailcow:
         mysql-mailcow:
           condition: service_started
           condition: service_started