public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

Merge branch 'staging' into staging

8f9ed9e0

DocFraggle <[email protected]> 3 years ago

data/Dockerfiles/postfix/postfix.sh | 101 +++++++++++++++++++++++-------------
 data/conf/postfix/dns_blocklists.cf |  25 ---------
 data/conf/postfix/main.cf           |   2 +-
 docker-compose.yml                  |   2 +-
 4 files changed, 67 insertions(+), 63 deletions(-)
 delete mode 100644 data/conf/postfix/dns_blocklists.cf

Diff

diff --cc data/Dockerfiles/postfix/postfix.sh
index 8099301a,731328d3..ba87aaa2
--- a/data/Dockerfiles/postfix/postfix.sh
+++ b/data/Dockerfiles/postfix/postfix.sh
@@@ -403,34 -435,18 +435,29 @@@ if [ ! -z "$DNSBL_CONFIG" ]; the
    ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net=127.0.0.[10;11]*8
    ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net=127.0.0.3*4
    ${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net=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
 +postscreen_dnsbl_reply_map = texthash:/opt/postfix/conf/dnsbl_reply
 +EOF
 +
 +  cat <<EOF > /opt/postfix/conf/dnsbl_reply
- # Autogenerated by mailcow, using Spamhaus DQS lists
++# Autogenerated by mailcow, using Spamhaus DQS reply domains
 +${SPAMHAUS_DQS_KEY}.sbl.dq.spamhaus.net     sbl.spamhaus.org
 +${SPAMHAUS_DQS_KEY}.xbl.dq.spamhaus.net     xbl.spamhaus.org
 +${SPAMHAUS_DQS_KEY}.pbl.dq.spamhaus.net     pbl.spamhaus.org
 +${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net     zen.spamhaus.org
 +${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net     dbl.spamhaus.org
 +${SPAMHAUS_DQS_KEY}.zrd.dq.spamhaus.net     zrd.spamhaus.org
  EOF
- 
- else
-   response=$(curl --connect-timeout 15 --max-time 30 -s -o /dev/null -w "%{http_code}" "https://asn-check.mailcow.email")
-   if [ "$response" -eq 503 ]; 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 > /tmp/spamhaus.cf
- # Autogenerated by mailcow, using no Spamhaus DNSBL
- EOF
-   elif [ "$response" -eq 200 ]; then
-   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 > /tmp/spamhaus.cf
- # Autogenerated by mailcow, using public spamhaus lists
+     )
+   else
+     response=$(curl --connect-timeout 15 --max-time 30 -s -o /dev/null -w "%{http_code}" "https://asn-check.mailcow.email")
+     if [ "$response" -eq 503 ]; 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"
+       SPAMHAUS_DNSBL_CONFIG=""
+     elif [ "$response" -eq 200 ]; then
+       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"
+       SPAMHAUS_DNSBL_CONFIG=$(cat <<EOF
    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
@@@ -490,4 -508,4 +519,4 @@@ if [[ $? != 0 ]]; the
  else
    postfix -c /opt/postfix/conf start
    sleep 126144000
--fi
++fi