From 58f83ffb70fba589786cf84eeb1d1b911befe94c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 11 Jun 2020 11:34:51 +0200 Subject: demote to non-mail-domain bitbase.dk redpill.dk superserver.dk --- amavis/nonlocal_domains | 3 --- bind/fake-222/bitbase.dk | 16 ++++++---------- bind/fake-222/redpill.dk | 13 +++++-------- bind/fake-222/superserver.dk | 12 ++++-------- bind/pri/bitbase.dk | 16 +++++----------- bind/pri/redpill.dk | 11 ++++------- bind/pri/superserver.dk | 10 +++------- 7 files changed, 27 insertions(+), 54 deletions(-) diff --git a/amavis/nonlocal_domains b/amavis/nonlocal_domains index 8e36db0..69c0c98 100644 --- a/amavis/nonlocal_domains +++ b/amavis/nonlocal_domains @@ -1,8 +1,5 @@ -bitbase.dk homebase.dk kaospilot.dk kaospilot.no lists.homebase.dk -redpill.dk -superserver.dk users.kaospilot.no diff --git a/bind/fake-222/bitbase.dk b/bind/fake-222/bitbase.dk index 912fb5f..8eabccd 100644 --- a/bind/fake-222/bitbase.dk +++ b/bind/fake-222/bitbase.dk @@ -3,14 +3,10 @@ $TTL 1h 2020053101 4h 1h 1w 1h ) -@ NS localhost. +$INCLUDE JONES.DK/skel/MX-avoid + NS localhost. A 80.68.88.141 - MX 10 mail.bitbase.dk. -; MX 50 mail.jones.dk. -; MX 50 mail.homebase.dk. - SPF "v=spf1 mx -all" -mail A 80.68.88.141 - SPF "v=spf1 a -all" + www A 80.68.88.141 MX 0 . SPF "v=spf1 -all" @@ -35,10 +31,11 @@ styles A 80.68.88.141 admin A 80.68.88.141 MX 0 . SPF "v=spf1 -all" + +$INCLUDE JONES.DK/skel/MX-avoid ns ns A 193.26.120.115 AAAA 2a06:e881:1702:1:400:c1ff:fe1a:7873 - MX 0 . - SPF "v=spf1 -all" + phone A 80.68.88.141 MX 0 . SPF "v=spf1 -all" @@ -66,7 +63,6 @@ _kerberos._udp SRV 0 0 88 coreander _ldap._tcp SRV 0 0 389 ldap ; SRV 0 0 389 xayide.jones.dk. ; SRV 0 0 389 jawa.homebase.dk. -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB" ; Public misc. records ;_iax._udp SRV 0 0 4569 coreander diff --git a/bind/fake-222/redpill.dk b/bind/fake-222/redpill.dk index 3da4208..415ae5e 100644 --- a/bind/fake-222/redpill.dk +++ b/bind/fake-222/redpill.dk @@ -3,19 +3,16 @@ $TTL 1h 2020051801 4h 1h 1w 1h ) -@ NS localhost. +$INCLUDE JONES.DK/skel/MX-avoid + NS localhost. A 80.68.88.141 - MX 10 mail.bitbase.dk. - MX 50 mail.jones.dk. - MX 50 mail.homebase.dk. - SPF "v=spf1 mx -all" -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB" + data CNAME xayide.jones.dk. *.data CNAME xayide.jones.dk. source CNAME xayide.jones.dk. *.source CNAME xayide.jones.dk. box CNAME morla.jones.dk. *.box CNAME morla.jones.dk. + +$INCLUDE JONES.DK/skel/MX-avoid * * A 80.68.88.141 - MX 0 . - SPF "v=spf1 -all" diff --git a/bind/fake-222/superserver.dk b/bind/fake-222/superserver.dk index 9937c7e..967be20 100644 --- a/bind/fake-222/superserver.dk +++ b/bind/fake-222/superserver.dk @@ -3,16 +3,13 @@ $TTL 1h 2020053101 4h 1h 1w 1h ) -@ NS localhost. +$INCLUDE JONES.DK/skel/MX-avoid + NS localhost. A 80.68.88.141 - MX 10 coreander.bitbase.dk. - MX 50 xayide.jones.dk. - MX 50 jawa.homebase.dk. - SPF "v=spf1 mx -all" + +$INCLUDE JONES.DK/skel/MX-avoid ns ns A 192.251.226.135 AAAA 2a06:e881:1700:1:400:c0ff:fefb:e287 - MX 0 . - SPF "v=spf1 -all" ; External hosts (use A and TXT-wrapped CNAME or PTR) @@ -23,7 +20,6 @@ ns A 192.251.226.135 ; Public CNAME-mapped PTR records ; Public authentication-related (LDAP and Kerberos) records -postfix._domainkey IN TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB" ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) abu CNAME coreander.bitbase.dk. diff --git a/bind/pri/bitbase.dk b/bind/pri/bitbase.dk index 75bbf39..0d2919e 100644 --- a/bind/pri/bitbase.dk +++ b/bind/pri/bitbase.dk @@ -4,13 +4,8 @@ $TTL 1h 4h 1h 1w 1h ) $INCLUDE JONES.DK/skel/NS +$INCLUDE JONES.DK/skel/MX-avoid A 80.68.88.141 - MX 10 mail.bitbase.dk. -; MX 50 mail.jones.dk. -; MX 50 mail.homebase.dk. - SPF "v=spf1 mx -all" -mail A 80.68.88.141 - SPF "v=spf1 a -all" www A 80.68.88.141 MX 0 . SPF "v=spf1 -all" @@ -35,10 +30,11 @@ styles A 80.68.88.141 admin A 80.68.88.141 MX 0 . SPF "v=spf1 -all" + +$INCLUDE JONES.DK/skel/MX-avoid ns ns A 193.26.120.115 AAAA 2a06:e881:1702:1:400:c1ff:fe1a:7873 - MX 0 . - SPF "v=spf1 -all" + phone A 80.68.88.141 MX 0 . SPF "v=spf1 -all" @@ -48,9 +44,8 @@ phone A 80.68.88.141 ; Public local hosts (use A) ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) +$INCLUDE JONES.DK/skel/MX-avoid * * A 80.68.88.141 - MX 0 . - SPF "v=spf1 -all" ; Public CNAME-mapped PTR records 80.68.88.141 PTR coreander.bitbase.dk. @@ -66,7 +61,6 @@ _kerberos._udp SRV 0 0 88 coreander _ldap._tcp SRV 0 0 389 ldap ; SRV 0 0 389 xayide.jones.dk. ; SRV 0 0 389 jawa.homebase.dk. -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB" ; Public misc. records ;_iax._udp SRV 0 0 4569 coreander diff --git a/bind/pri/redpill.dk b/bind/pri/redpill.dk index 2a90732..f34133e 100644 --- a/bind/pri/redpill.dk +++ b/bind/pri/redpill.dk @@ -4,18 +4,15 @@ $TTL 1h 4h 1h 1w 1h ) $INCLUDE JONES.DK/skel/NS +$INCLUDE JONES.DK/skel/MX-avoid A 80.68.88.141 - MX 10 mail.bitbase.dk. - MX 50 mail.jones.dk. - MX 50 mail.homebase.dk. - SPF "v=spf1 mx -all" -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB" + data CNAME xayide.jones.dk. *.data CNAME xayide.jones.dk. source CNAME xayide.jones.dk. *.source CNAME xayide.jones.dk. box CNAME morla.jones.dk. *.box CNAME morla.jones.dk. + +$INCLUDE JONES.DK/skel/MX-avoid * * A 80.68.88.141 - MX 0 . - SPF "v=spf1 -all" diff --git a/bind/pri/superserver.dk b/bind/pri/superserver.dk index d226529..7c21d46 100644 --- a/bind/pri/superserver.dk +++ b/bind/pri/superserver.dk @@ -4,15 +4,12 @@ $TTL 1h 4h 1h 1w 1h ) $INCLUDE JONES.DK/skel/NS +$INCLUDE JONES.DK/skel/MX-avoid A 80.68.88.141 - MX 10 coreander.bitbase.dk. - MX 50 xayide.jones.dk. - MX 50 jawa.homebase.dk. - SPF "v=spf1 mx -all" + +$INCLUDE JONES.DK/skel/MX-avoid ns ns A 192.251.226.135 AAAA 2a06:e881:1700:1:400:c0ff:fefb:e287 - MX 0 . - SPF "v=spf1 -all" ; External hosts (use A and TXT-wrapped CNAME or PTR) @@ -23,7 +20,6 @@ ns A 192.251.226.135 ; Public CNAME-mapped PTR records ; Public authentication-related (LDAP and Kerberos) records -postfix._domainkey IN TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD13QGUJb9NF5wOE6YDArVuLb7Fko6c3OsdGwfRQbwyV/BbWKfJReo1bao59alO4IkkSKGXNRF2vlsTQOHRL8DyN2oAcg3siA5/Dga7x7jodmPP5eWGwLpRVSQhj/FPwT2l1Grr9+OLzxBd8C2oPhA0nkoaLZQt6VTayR836Ps4DwIDAQAB" ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) abu CNAME coreander.bitbase.dk. -- cgit v1.2.3