drop obsolete reference to cloud host coreander.bitbase.dk 80.68.88.141

9 files changed, 48 insertions, 126 deletions

diff --git a/bind/fake-222/bitbase.dk b/bind/fake-222/bitbase.dk
index 2cb7eef..40e56a6 100644
--- a/bind/fake-222/bitbase.dk
+++ b/bind/fake-222/bitbase.dk
@@ -5,67 +5,31 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/MX-avoid
 @ NS localhost.
-		A	80.68.88.141
-
-www		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-ftp		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-coreander	A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-stats		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-search		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-wiki		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-styles		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-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
 
-phone		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
 ; Public local hosts (use A)
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
-*		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-
-; Public CNAME-mapped PTR records
-80.68.88.141	PTR	coreander.bitbase.dk.
 
 ; Public authentication-related (LDAP and Kerberos) records
 _kerberos		TXT	"BITBASE.DK"
-_kerberos-master._udp	SRV	0 0 88 coreander
-_kerberos-adm._tcp	SRV	0 0 749 coreander
-_kpasswd._udp		SRV	0 0 464 coreander
-_kerberos._udp		SRV	0 0 88 coreander
+_kerberos-master._udp	SRV	0 0 88 coreander.jones.dk.
+_kerberos-adm._tcp	SRV	0 0 749 coreander.jones.dk.
+_kpasswd._udp		SRV	0 0 464 coreander.jones.dk.
+_kerberos._udp		SRV	0 0 88 coreander.jones.dk.
 ;			SRV	0 0 88 xayide.jones.dk.
 _ldap._tcp		SRV	0 0 389 ldap
 ;			SRV	0 0 389 xayide.jones.dk.
 
 ; Public misc. records
-;_iax._udp 		SRV	0 0 4569 coreander
-_sip._udp 		SRV	0 0 5060 coreander
-_sips._tcp 		SRV	0 0 5061 coreander
+;_iax._udp 		SRV	0 0 4569 coreander.jones.dk.
+_sip._udp 		SRV	0 0 5060 coreander.jones.dk.
+_sips._tcp 		SRV	0 0 5061 coreander.jones.dk.
 
 ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
 
diff --git a/bind/fake-222/oroe.dk b/bind/fake-222/oroe.dk
index 9f9652a..374704d 100644
--- a/bind/fake-222/oroe.dk
+++ b/bind/fake-222/oroe.dk
@@ -15,8 +15,8 @@ phpmyadmin CNAME dbadmin.one.com.
 pop A 46.30.211.21
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222 genskabet
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222 www.genskabet
-$INCLUDE /etc/local-JONES.DK/bind/skel/A-legacycloud source
-$INCLUDE /etc/local-JONES.DK/bind/skel/A-legacycloud *.source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud *.source
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222 mejeriet
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222 source.mejeriet
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222 www.mejeriet
diff --git a/bind/fake-222/redpill.dk b/bind/fake-222/redpill.dk
index 9dfcb29..9778373 100644
--- a/bind/fake-222/redpill.dk
+++ b/bind/fake-222/redpill.dk
@@ -5,7 +5,6 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/MX-avoid
 @ NS localhost.
-		A	80.68.88.141
 
 data		CNAME xayide.jones.dk.
 *.data		CNAME xayide.jones.dk.
@@ -14,4 +13,3 @@ source		CNAME xayide.jones.dk.
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud box
 
 $INCLUDE JONES.DK/skel/MX-avoid *
-*		A	80.68.88.141
diff --git a/bind/fake-222/superserver.dk b/bind/fake-222/superserver.dk
index 0b54c06..a3d6d25 100644
--- a/bind/fake-222/superserver.dk
+++ b/bind/fake-222/superserver.dk
@@ -5,7 +5,6 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/MX-avoid
 @ NS localhost.
-		A	80.68.88.141
 
 $INCLUDE JONES.DK/skel/MX-avoid ns
 ns		A	193.26.120.98
@@ -22,22 +21,22 @@ ns		A	193.26.120.98
 ; Public authentication-related (LDAP and Kerberos) records
 
 ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
-abu		CNAME	coreander.bitbase.dk.
-*.abu		CNAME	coreander.bitbase.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-www aurora
-fo		CNAME	coreander.bitbase.dk.
-*.fo		CNAME	coreander.bitbase.dk.
-gritt		CNAME	coreander.bitbase.dk.
-*.gritt		CNAME	coreander.bitbase.dk.
-kik		CNAME	coreander.bitbase.dk.
-*.kik		CNAME	coreander.bitbase.dk.
-streaming	CNAME	coreander.bitbase.dk.
-*.streaming	CNAME	coreander.bitbase.dk.
-mail		CNAME	coreander.bitbase.dk.
-*.mail		CNAME	coreander.bitbase.dk.
-kick		CNAME	coreander.bitbase.dk.
-*.kick		CNAME	coreander.bitbase.dk.
-*		CNAME	coreander.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
 
 ; Public local services (use CNAME)
 
diff --git a/bind/pri/bitbase.dk b/bind/pri/bitbase.dk
index 6f090d1..14d08f4 100644
--- a/bind/pri/bitbase.dk
+++ b/bind/pri/bitbase.dk
@@ -5,65 +5,31 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/MX-avoid
-@		A	80.68.88.141
-www		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-ftp		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-coreander	A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-stats		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-search		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-wiki		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-styles		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-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
 
-phone		A	80.68.88.141
-		MX 0	.
-		SPF	"v=spf1 -all"
-
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
 ; 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
-
-; Public CNAME-mapped PTR records
-80.68.88.141	PTR	coreander.bitbase.dk.
 
 ; Public authentication-related (LDAP and Kerberos) records
 _kerberos		TXT	"BITBASE.DK"
-_kerberos-master._udp	SRV	0 0 88 coreander
-_kerberos-adm._tcp	SRV	0 0 749 coreander
-_kpasswd._udp		SRV	0 0 464 coreander
-_kerberos._udp		SRV	0 0 88 coreander
+_kerberos-master._udp	SRV	0 0 88 coreander.jones.dk.
+_kerberos-adm._tcp	SRV	0 0 749 coreander.jones.dk.
+_kpasswd._udp		SRV	0 0 464 coreander.jones.dk.
+_kerberos._udp		SRV	0 0 88 coreander.jones.dk.
 ;			SRV	0 0 88 xayide.jones.dk.
 _ldap._tcp		SRV	0 0 389 ldap
 ;			SRV	0 0 389 xayide.jones.dk.
 
 ; Public misc. records
-;_iax._udp 		SRV	0 0 4569 coreander
-_sip._udp 		SRV	0 0 5060 coreander
-_sips._tcp 		SRV	0 0 5061 coreander
+;_iax._udp 		SRV	0 0 4569 coreander.jones.dk.
+_sip._udp 		SRV	0 0 5060 coreander.jones.dk.
+_sips._tcp 		SRV	0 0 5061 coreander.jones.dk.
 
 ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
 
diff --git a/bind/pri/oroe.dk b/bind/pri/oroe.dk
index 687cb8b..5f6fd7e 100644
--- a/bind/pri/oroe.dk
+++ b/bind/pri/oroe.dk
@@ -15,8 +15,8 @@ phpmyadmin CNAME dbadmin.one.com.
 pop A 46.30.211.21
 $INCLUDE /etc/local-JONES.DK/bind/skel/A genskabet
 $INCLUDE /etc/local-JONES.DK/bind/skel/A www.genskabet
-$INCLUDE /etc/local-JONES.DK/bind/skel/A-legacycloud source
-$INCLUDE /etc/local-JONES.DK/bind/skel/A-legacycloud *.source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud source
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud *.source
 $INCLUDE /etc/local-JONES.DK/bind/skel/A mejeriet
 $INCLUDE /etc/local-JONES.DK/bind/skel/A source.mejeriet
 $INCLUDE /etc/local-JONES.DK/bind/skel/A www.mejeriet
diff --git a/bind/pri/redpill.dk b/bind/pri/redpill.dk
index 1d88d1f..887a367 100644
--- a/bind/pri/redpill.dk
+++ b/bind/pri/redpill.dk
@@ -5,7 +5,6 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/MX-avoid
-@		A	80.68.88.141
 
 data		CNAME xayide.jones.dk.
 *.data		CNAME xayide.jones.dk.
@@ -14,4 +13,3 @@ source		CNAME xayide.jones.dk.
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-X-cloud box
 
 $INCLUDE JONES.DK/skel/MX-avoid *
-*		A	80.68.88.141
diff --git a/bind/pri/superserver.dk b/bind/pri/superserver.dk
index 16cfbca..d6026b3 100644
--- a/bind/pri/superserver.dk
+++ b/bind/pri/superserver.dk
@@ -5,7 +5,6 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/MX-avoid
-@		A	80.68.88.141
 
 $INCLUDE JONES.DK/skel/MX-avoid ns
 ns		A	193.26.120.98
@@ -22,22 +21,22 @@ ns		A	193.26.120.98
 ; Public authentication-related (LDAP and Kerberos) records
 
 ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
-abu		CNAME	coreander.bitbase.dk.
-*.abu		CNAME	coreander.bitbase.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-www aurora
-fo		CNAME	coreander.bitbase.dk.
-*.fo		CNAME	coreander.bitbase.dk.
-gritt		CNAME	coreander.bitbase.dk.
-*.gritt		CNAME	coreander.bitbase.dk.
-kik		CNAME	coreander.bitbase.dk.
-*.kik		CNAME	coreander.bitbase.dk.
-streaming	CNAME	coreander.bitbase.dk.
-*.streaming	CNAME	coreander.bitbase.dk.
-mail		CNAME	coreander.bitbase.dk.
-*.mail		CNAME	coreander.bitbase.dk.
-kick		CNAME	coreander.bitbase.dk.
-*.kick		CNAME	coreander.bitbase.dk.
-*		CNAME	coreander.jones.dk.
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
+$INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-legacycloud afp
 
 ; Public local services (use CNAME)
 
diff --git a/bind/skel/A-legacycloud b/bind/skel/A-legacycloud
deleted file mode 100644
index 9c3a667..0000000
--- a/bind/skel/A-legacycloud
+++ /dev/null
@@ -1,2 +0,0 @@
-@ A 80.68.88.141
-@ TXT "Addr=London, United Kingdom"