From 3211acdd2e0acc37904f01d98dd1ef4d3674c107 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 27 Nov 2021 12:21:56 +0100 Subject: drop HOMEBASE (homebase.dk kaospilot.no) --- amavis/nonlocal_domains | 4 --- bind/fake-222/bitbase.dk | 2 -- bind/fake-222/jones.dk | 64 ------------------------------------------------ bind/named.conf-morla | 1 - bind/named.conf.acl | 1 - bind/named.conf.local | 2 -- bind/pri/bitbase.dk | 2 -- bind/pri/jones.dk | 64 ------------------------------------------------ bind/skel/NS | 1 - cfengine/cf.site | 1 - 10 files changed, 142 deletions(-) diff --git a/amavis/nonlocal_domains b/amavis/nonlocal_domains index 2db5b82..b87d1c5 100644 --- a/amavis/nonlocal_domains +++ b/amavis/nonlocal_domains @@ -1,5 +1 @@ fsub.de -homebase.dk -kaospilot.no -lists.homebase.dk -users.kaospilot.no diff --git a/bind/fake-222/bitbase.dk b/bind/fake-222/bitbase.dk index b153de4..f0970a6 100644 --- a/bind/fake-222/bitbase.dk +++ b/bind/fake-222/bitbase.dk @@ -59,10 +59,8 @@ _kerberos-adm._tcp SRV 0 0 749 coreander _kpasswd._udp SRV 0 0 464 coreander _kerberos._udp SRV 0 0 88 coreander ; SRV 0 0 88 xayide.jones.dk. -; SRV 0 0 88 jawa.homebase.dk. _ldap._tcp SRV 0 0 389 ldap ; SRV 0 0 389 xayide.jones.dk. -; SRV 0 0 389 jawa.homebase.dk. ; Public misc. records ;_iax._udp SRV 0 0 4569 coreander diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk index ea9ed76..fe32226 100644 --- a/bind/fake-222/jones.dk +++ b/bind/fake-222/jones.dk @@ -27,70 +27,6 @@ $INCLUDE JONES.DK/skel/MX-avoid dns ; External hosts (use A and TXT-wrapped CNAME or PTR) -$INCLUDE JONES.DK/skel/MX-avoid tomos -tomos A 94.18.231.210 - HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=tomos.homebase.dk" - TXT "Addr=Aarhus, Denmark" - SSHFP 1 1 8fc4c566213ec303c7e0c9ace375c2c8edbd1879 - SSHFP 1 2 9123fc27555a5adea81180d08df9f34ab3ce06765fb94d96effed0b2c5122d6c - SSHFP 3 1 f70bd684478944d89e00afdd3b675036319743da - SSHFP 3 2 775f2940929b3cdaf1ada41d946d099e860587ce9a844d1a4200c6599b184c25 - SSHFP 4 1 72af581a0df7b99aa1c2752c8453bc46e012f17a - SSHFP 4 2 e325ccae1923a52201c62978bf2f5332c6e8848224504e753735cb3b3c37f14a - -$INCLUDE JONES.DK/skel/MX-avoid wanderer -wanderer A 94.18.231.211 - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=wanderer.homebase.dk" - TXT "Addr=Aarhus, Denmark" - -$INCLUDE JONES.DK/skel/MX-avoid jawa -jawa A 94.18.231.212 - HINFO "AMD Sempron 3200+ @ 1.80GHz" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=jawa.homebase.dk" - TXT "Addr=Aarhus, Denmark" - SSHFP 1 1 3b3f4f1dad6b489b215741f0a5f1fae9fbb72d7e - SSHFP 1 2 bb6bd61fa0120ee6064352e0becf4e40416a972a6ebc51ef1c6a6c7646925191 - SSHFP 2 1 118f4afc9f975e2bc61587c402c584485e1aa93c - SSHFP 2 2 e49e17ecada314e0e75f3daa7c1ee1178181c78f84a6b41b5baf4ec8da78bc22 - SSHFP 3 1 c88896018a4c605b53bbbb502c98602aa3244464 - SSHFP 3 2 bb10e52d684a7db54dff2902ea2cf80e6124b7dbc70094165d138e75bac6cbdf - SSHFP 4 1 2f16fb7fb3a19286f5396b31eb534ad4c4ff9d9e - SSHFP 4 2 8ace7e6ef27e38ec1cb69a459e8ef928663d324093e674fc2e0f20e4af08ae27 - -$INCLUDE JONES.DK/skel/MX-avoid hamlet -hamlet A 94.18.231.213 - HINFO "Allwinner Dual A20 @ 1GHz (Olimex A20-OLinuXino-LIME)" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=hamlet.homebase.dk" - TXT "Addr=Aarhus, Denmark" - -$INCLUDE JONES.DK/skel/MX-avoid nimbus -nimbus A 94.18.231.214 - HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=nimbus.homebase.dk" - TXT "Addr=Aarhus, Denmark" - SSHFP 1 1 f49ae75324ce5c2dfb27c1e733d65bcbc6449256 - SSHFP 1 2 f9d7db2c1d632cf7ca0ce94756a3e3be58aa67b1f4d89613fc98da680dadb86f - SSHFP 3 1 92eb4e7ad10e6d9594b54ca107129f2ffd57cad5 - SSHFP 3 2 5b417665a4429a7304a5cfd2a5da3b38260047a64caec37c39ad69d32cbbcc42 - SSHFP 4 1 18672d30046f2e42a4ad0480908aefbf64f5fb59 - SSHFP 4 2 d1b7275fb9575e28e2579392c5d2cc73bab41af30778f1f0a2c66d68eaf252a8 - $INCLUDE JONES.DK/skel/MX-avoid lxp5 lxp5 A 193.26.120.98 AAAA 2a06:e881:1706:1:0:c1ff:fe1a:7862 diff --git a/bind/named.conf-morla b/bind/named.conf-morla index 0451ab7..1d68bdb 100644 --- a/bind/named.conf-morla +++ b/bind/named.conf-morla @@ -2,6 +2,5 @@ include "/etc/local-JONES.DK/bind/named.conf.acl"; include "/etc/local-JONES.DK/bind/named.conf.pri"; include "/etc/local-REDPILL.DK/bind/named.conf.FSUB.DE"; -include "/etc/local-REDPILL.DK/bind/named.conf.HOMEBASE.DK"; include "/etc/local-REDPILL.DK/bind/named.conf.SHAKTI.IN"; diff --git a/bind/named.conf.acl b/bind/named.conf.acl index 52f6f5d..7261dfe 100644 --- a/bind/named.conf.acl +++ b/bind/named.conf.acl @@ -4,7 +4,6 @@ acl jones_peers { 2a06:e881:1706:1:0:c1ff:fe1a:7862; 193.26.120.115; // ns.bitbase.dk 2a06:e881:1702:1:400:c1ff:fe1a:7873; - 94.18.231.212; // ns.homebase.dk 188.183.5.254; // dns.jones.dk 146.185.137.224; // ns.copyninja.info 217.70.177.40; // ns6.gandi.net diff --git a/bind/named.conf.local b/bind/named.conf.local index e5b9193..4576a07 100644 --- a/bind/named.conf.local +++ b/bind/named.conf.local @@ -5,7 +5,6 @@ view "internal" { include "/etc/local-JONES.DK/bind/named.conf.fake-222"; include "/etc/local-REDPILL.DK/bind/named.conf.FSUB.DE"; - include "/etc/local-REDPILL.DK/bind/named.conf.HOMEBASE.DK"; include "/etc/local-REDPILL.DK/bind/named.conf.SHAKTI.IN"; include "/etc/bind/named.conf.default-zones"; @@ -19,7 +18,6 @@ view "external" { include "/etc/local-JONES.DK/bind/named.conf.pri"; include "/etc/local-REDPILL.DK/bind/named.conf.FSUB.DE.internal"; - include "/etc/local-REDPILL.DK/bind/named.conf.HOMEBASE.DK.internal"; include "/etc/local-REDPILL.DK/bind/named.conf.SHAKTI.IN.internal"; include "/etc/bind/named.conf.default-zones"; diff --git a/bind/pri/bitbase.dk b/bind/pri/bitbase.dk index 1feeb85..b7e62ea 100644 --- a/bind/pri/bitbase.dk +++ b/bind/pri/bitbase.dk @@ -57,10 +57,8 @@ _kerberos-adm._tcp SRV 0 0 749 coreander _kpasswd._udp SRV 0 0 464 coreander _kerberos._udp SRV 0 0 88 coreander ; SRV 0 0 88 xayide.jones.dk. -; SRV 0 0 88 jawa.homebase.dk. _ldap._tcp SRV 0 0 389 ldap ; SRV 0 0 389 xayide.jones.dk. -; SRV 0 0 389 jawa.homebase.dk. ; Public misc. records ;_iax._udp SRV 0 0 4569 coreander diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk index c61025d..9e6f124 100644 --- a/bind/pri/jones.dk +++ b/bind/pri/jones.dk @@ -27,70 +27,6 @@ $INCLUDE JONES.DK/skel/MX-avoid dns ; External hosts (use A and TXT-wrapped CNAME or PTR) -$INCLUDE JONES.DK/skel/MX-avoid tomos -tomos A 94.18.231.210 - HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=tomos.homebase.dk" - TXT "Addr=Aarhus, Denmark" - SSHFP 1 1 8fc4c566213ec303c7e0c9ace375c2c8edbd1879 - SSHFP 1 2 9123fc27555a5adea81180d08df9f34ab3ce06765fb94d96effed0b2c5122d6c - SSHFP 3 1 f70bd684478944d89e00afdd3b675036319743da - SSHFP 3 2 775f2940929b3cdaf1ada41d946d099e860587ce9a844d1a4200c6599b184c25 - SSHFP 4 1 72af581a0df7b99aa1c2752c8453bc46e012f17a - SSHFP 4 2 e325ccae1923a52201c62978bf2f5332c6e8848224504e753735cb3b3c37f14a - -$INCLUDE JONES.DK/skel/MX-avoid wanderer -wanderer A 94.18.231.211 - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=wanderer.homebase.dk" - TXT "Addr=Aarhus, Denmark" - -$INCLUDE JONES.DK/skel/MX-avoid jawa -jawa A 94.18.231.212 - HINFO "AMD Sempron 3200+ @ 1.80GHz" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=jawa.homebase.dk" - TXT "Addr=Aarhus, Denmark" - SSHFP 1 1 3b3f4f1dad6b489b215741f0a5f1fae9fbb72d7e - SSHFP 1 2 bb6bd61fa0120ee6064352e0becf4e40416a972a6ebc51ef1c6a6c7646925191 - SSHFP 2 1 118f4afc9f975e2bc61587c402c584485e1aa93c - SSHFP 2 2 e49e17ecada314e0e75f3daa7c1ee1178181c78f84a6b41b5baf4ec8da78bc22 - SSHFP 3 1 c88896018a4c605b53bbbb502c98602aa3244464 - SSHFP 3 2 bb10e52d684a7db54dff2902ea2cf80e6124b7dbc70094165d138e75bac6cbdf - SSHFP 4 1 2f16fb7fb3a19286f5396b31eb534ad4c4ff9d9e - SSHFP 4 2 8ace7e6ef27e38ec1cb69a459e8ef928663d324093e674fc2e0f20e4af08ae27 - -$INCLUDE JONES.DK/skel/MX-avoid hamlet -hamlet A 94.18.231.213 - HINFO "Allwinner Dual A20 @ 1GHz (Olimex A20-OLinuXino-LIME)" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=hamlet.homebase.dk" - TXT "Addr=Aarhus, Denmark" - -$INCLUDE JONES.DK/skel/MX-avoid nimbus -nimbus A 94.18.231.214 - HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux" - TXT "Owner=Homebase" - TXT "ISP=globalconnect.dk" - TXT "Link=50Mbit" - TXT "PTR=nimbus.homebase.dk" - TXT "Addr=Aarhus, Denmark" - SSHFP 1 1 f49ae75324ce5c2dfb27c1e733d65bcbc6449256 - SSHFP 1 2 f9d7db2c1d632cf7ca0ce94756a3e3be58aa67b1f4d89613fc98da680dadb86f - SSHFP 3 1 92eb4e7ad10e6d9594b54ca107129f2ffd57cad5 - SSHFP 3 2 5b417665a4429a7304a5cfd2a5da3b38260047a64caec37c39ad69d32cbbcc42 - SSHFP 4 1 18672d30046f2e42a4ad0480908aefbf64f5fb59 - SSHFP 4 2 d1b7275fb9575e28e2579392c5d2cc73bab41af30778f1f0a2c66d68eaf252a8 - $INCLUDE JONES.DK/skel/MX-avoid lxp5 lxp5 A 193.26.120.98 AAAA 2a06:e881:1706:1:0:c1ff:fe1a:7862 diff --git a/bind/skel/NS b/bind/skel/NS index fdad4e0..dd8abaa 100644 --- a/bind/skel/NS +++ b/bind/skel/NS @@ -1,6 +1,5 @@ @ NS dns.jones.dk. @ NS ns.bitbase.dk. @ NS ns.superserver.dk. -@ NS ns.homebase.dk. @ CAA 0 issue "letsencrypt.org" @ CAA 0 iodef "mailto:hostmaster@jones.dk" diff --git a/cfengine/cf.site b/cfengine/cf.site index 9e62e37..6fe933c 100644 --- a/cfengine/cf.site +++ b/cfengine/cf.site @@ -20,7 +20,6 @@ defaultroute: resolve: "search macvaerk.com" # last one searched - "search homebase.dk" # 2nd .. "search jones.dk" # first one searched NameServer:: 127.0.0.1 # localhost -- cgit v1.2.3