Cleanup jones.dk hostnames: Drop hykrion, hysbald, graograman, lyng, opgang2. Update xayide, perilin, auryn, atreju.

2 files changed, 30 insertions, 156 deletions

diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 5becc72..de6cfd7 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -124,18 +124,20 @@ xayide		A	192.168.222.250 ;188.183.5.254
 		MX 0	.
 		SPF	"v=spf1 a -all"
 		HINFO	"Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
-		LOC	55 38 N 012 05 E 100m
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
 		TYPE44	\# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
 		TYPE44	\# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
+		TXT	"Desc=Application server"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
+		TXT	"ISP=Unotel"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Mogenstrup, Regstrup"
+		TXT	"CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
+		TXT	"Addr=Oroe"
 auryn		A	192.168.222.52
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"Intel Core2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 auryn-old	A	192.168.222.53
 		MX 0	.
@@ -151,30 +153,13 @@ atreju		A	192.168.222.57
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 bastian		A	192.168.222.58
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-hysbald		A	192.168.222.252 ;188.183.5.254; via xayide.jones.dk
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"VIA Nehemiah (VIA C3M266 fanless)" "Debian GNU/Linux"
-		LOC	55 38 N 012 05 E 100m
-		TYPE44	\# 22 01 01 42c039819d2a94fb5379e3bc8fd1a001f316a71e
-		TYPE44	\# 22 02 01 de9694a8c4b0fa8ac7e6d95ea7e7c45b3034ca3f
-		TXT	"Desc=Application server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Mogenstrup, Regstrup"
-;graograman	A	192.168.222.13
-;		MX 0	.
-;		SPF	"v=spf1 -all"
-;		LOC	55 38 N 012 05 E 100m
-;		HINFO	"VIA Samuel 2 (VIA EPIA ME6000 fanless)" "Debian GNU/Linux"
 dharma		A	192.168.222.125
 		MX 0	.
 		SPF	"v=spf1 -all"
@@ -184,13 +169,13 @@ slamuf		A	192.168.222.251 ;188.183.5.254; via xayide.jones.dk
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
-		LOC	55 38 N 012 05 E 100m
-		TXT	"Desc=Backup server @ MSG"
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
+		TXT	"Desc=Storage server"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Mogenstrup, Regstrup"
+		TXT	"CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
+		TXT	"Addr=Oroe"
 hydorn		A	192.168.222.248
 		MX 0	.
 		SPF	"v=spf1 -all"
@@ -218,55 +203,20 @@ cairon		A	192.168.222.253 ; 188.183.5.254 ; via xayide.jones.dk
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-hykrion		A	192.168.222.254 ;188.183.5.254; via xayide.jones.dk
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Via Nehemiah (VIA EPIA MS10000E fanless)" "Debian GNU/Linux"
-		LOC	55 38 N 012 05 E 100m
-		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
-		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
-		TXT	"Desc=Development server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Mogenstrup, Regstrup"
 perilin		A	192.168.222.1 ;188.183.5.254; via xayide.jones.dk
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
-		LOC	55 38 N 012 05 E 100m
-		TXT	"Desc=Development server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Mogenstrup, Regstrup"
-lyng		A	78.157.124.70
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"VIA Samuel 2 (VIA EPIA EK fanless)" "Debian GNU/Linux"
-		LOC	55 54 11.51 N 8 26 8.49 E 10m 2m
-		TXT	"Desc=Storage server"
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
+		TXT	"Desc=Gateway"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Sydenergi"
-		TXT	"Link=Fiber"
-		TXT	"CNAME="
-		TXT	"Addr=Loenborg"
-opgang2		A	87.63.193.34
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Celeron" "Debian GNU/Linux"
-		TXT	"Desc=Firewall @ Opgang 2"
-		TXT	"Owner=Opgang 2"
-		TXT	"ISP=TDC"
+		TXT	"ISP=Unotel"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573fc122.cpe.ge-1-1-0-1101.arcnqu2.customer.tele.dk"
-		TXT	"Addr=Aarhus"
+		TXT	"CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
+		TXT	"Addr=Oroe"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *.lists		CNAME	lists
-*.hysbald	CNAME	hysbald
 *.auryn 	A	192.168.0.103
 		MX 0	.
 		SPF	"v=spf1 -all"
@@ -284,9 +234,7 @@ opgang2		A	87.63.193.34
 ;;_krb524._udp		SRV	0 0 4444 cairon
 ;_kerberos._udp		SRV	0 0 88 cairon
 ;			SRV	0 0 88 xayide
-;			SRV	0 0 88 hysbald
 ;_ldap._tcp		SRV	0 0 389 xayide
-;			SRV	0 0 389 hysbald
 postfix._domainkey	TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
 event			CNAME	xayide
 *.event			CNAME	xayide
@@ -296,8 +244,6 @@ _xmpp-server._tcp	SRV	0 0 5269 xayide
 _xmpp-client._tcp	SRV	0 0 5222 xayide
 ;_iax._udp		SRV	0 0 4569 xayide
 ;_sip._udp		SRV	0 0 5060 xayide
-_sip._udp		SRV	0 0 5060 lyng
-_sips._tcp		SRV	0 0 5061 lyng
 _stun._udp		SRV	0 0 3478 xayide
 _stun._tcp		SRV	0 0 3478 xayide
 _stuns._tcp		SRV	0 0 5349 xayide
@@ -426,11 +372,6 @@ wiki		CNAME	coreander
 *.wiki		CNAME	coreander
 trekroner	CNAME	xayide	; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
 *.trekroner	CNAME	xayide
-*.hykrion	CNAME	hykrion
-secure		CNAME	hykrion
-*.secure	CNAME	hykrion
-playingnow	CNAME	hysbald
-*.playingnow	CNAME	hysbald
 steiner		CNAME	xayide
 *.steiner	CNAME	xayide
 admin		CNAME	xayide
@@ -518,7 +459,6 @@ hafferlaffen	A	192.168.222.116
 192.168.222.4	PTR	buffalo
 192.168.222.11	PTR	groab
 192.168.222.12	PTR	altsahir
-192.168.222.13	PTR	graograman
 192.168.222.21	PTR	lp1
 192.168.222.22	PTR	lp2
 192.168.222.23	PTR	lp3
@@ -542,9 +482,7 @@ hafferlaffen	A	192.168.222.116
 192.168.222.249	PTR	hynreck
 192.168.222.250	PTR	xayide
 192.168.222.251	PTR	slamuf
-192.168.222.252	PTR	hysbald
 192.168.222.253	PTR	cairon
-192.168.222.254	PTR	hykrion
 
 ; Private services (use CNAME)
 proxy		CNAME	slamuf
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index ad89f5e..ffd6324 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -131,14 +131,13 @@ xayide		A	188.183.5.254
 		MX 0	.
 		SPF	"v=spf1 a -all"
 		HINFO	"Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
-		LOC	55 38 51.67 N 11 30 12.71 E 28m 2m
-		TYPE44	\# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
-		TYPE44	\# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
+		TXT	"Desc=Application server"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
+		TXT	"ISP=Unotel"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573b188a.cpe.ge-1-2-0-1101.hknqu1.customer.tele.dk"
-		TXT	"Addr=Moerkoev"
+		TXT	"CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
+		TXT	"Addr=Oroe"
 auryn		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"Intel Core 2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
@@ -150,40 +149,23 @@ auryn-old	MX 0	.
 atreju		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 bastian		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-hysbald		A	188.183.5.254 ; via xayide.jones.dk
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"VIA Nehemiah (VIA C3M266 fanless)" "Debian GNU/Linux"
-		LOC	55 38 N 012 05 E 100m
-		TYPE44	\# 22 01 01 42c039819d2a94fb5379e3bc8fd1a001f316a71e
-		TYPE44	\# 22 02 01 de9694a8c4b0fa8ac7e6d95ea7e7c45b3034ca3f
-		TXT	"Desc=Application server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Mogenstrup, Regstrup"
-;graograman	A	XXX
-;		MX 0	.
-;		SPF	"v=spf1 -all"
-;		HINFO	"VIA Samuel 2 (VIA EPIA ME6000 fanless)" "Debian GNU/Linux"
-;		LOC	55 38 N 012 05 E 100m
 slamuf		A	188.183.5.254 ; via xayide.jones.dk
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
-		LOC	55 38 51.67 N 11 30 12.71 E 28m 2m
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
 		TXT	"Desc=Storage server"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=Unotel"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573b188a.cpe.ge-1-2-0-1101.hknqu1.customer.tele.dk"
-		TXT	"Addr=Moerkoev"
+		TXT	"CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
+		TXT	"Addr=Oroe"
 hydorn		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
@@ -209,62 +191,25 @@ hynreck		MX 0	.
 ;		TXT	"Link=ADSL"
 ;		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 ;		TXT	"Addr=Mogenstrup, Regstrup"
-;hykrion		A	188.183.5.254 ; via xayide.jones.dk
-;		MX 0	.
-;		SPF	"v=spf1 -all"
-;		HINFO	"Via Nehemiah (VIA EPIA MS10000E fanless)" "Debian GNU/Linux"
-;		LOC	55 38 N 012 05 E 100m
-;		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
-;		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
-;		TXT	"Desc=Development server @ MSG"
-;		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;		TXT	"ISP=Unotel"
-;		TXT	"Link=ADSL"
-;		TXT	"CNAME=0x573b188a.cpe.ge-1-2-0-1101.hknqu1.customer.tele.dk"
-;		TXT	"Addr=Mogenstrup, Regstrup"
 perilin		A	188.183.5.254 ; via xayide.jones.dk
 		MX 0	.
 		SPF	"v=spf1 -all"
 		HINFO	"VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
-		LOC	55 38 51.51 N 11 30 12.62 E 29m 2m
-		TXT	"Desc=Development server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
-		TXT	"Addr=Moerkoev"
-lyng		A	78.157.124.70
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"VIA Samuel 2 (VIA EPIA EK fanless)" "Debian GNU/Linux"
-		LOC	55 54 11.51 N 8 26 8.49 E 10m 2m
-		TXT	"Desc=Storage server"
+		LOC	55 45 51.54 N 11 49 1.64 E 10m 10m
+		TXT	"Desc=Gateway"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Sydenergi"
-		TXT	"Link=Fiber"
-		TXT	"CNAME="
-		TXT	"Addr=Loenborg"
-opgang2		A	87.63.193.34
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Celeron" "Debian GNU/Linux"
-		TXT	"Desc=Firewall @ Opgang 2"
-		TXT	"Owner=Opgang 2"
-		TXT	"ISP=TDC"
+		TXT	"ISP=Unotel"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573fc122.cpe.ge-1-1-0-1101.arcnqu2.customer.tele.dk"
-		TXT	"Addr=Aarhus"
+		TXT	"CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
+		TXT	"Addr=Oroe"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *.lists		CNAME	lists
-*.hysbald	CNAME	hysbald
 *.auryn 	A	192.168.0.103
 		MX 0	.
 		SPF	"v=spf1 -all"
 
 ; Public CNAME-mapped PTR records
-;188.183.5.254	PTR	hykrion
-;188.183.5.254	PTR	hysbald
 188.183.5.254	PTR	xayide
 
 ;; Public complex records
@@ -278,9 +223,7 @@ opgang2		A	87.63.193.34
 ;;_krb524._udp		SRV	0 0 4444 cairon
 ;_kerberos._udp		SRV	0 0 88 cairon
 ;			SRV	0 0 88 xayide
-;			SRV	0 0 88 hysbald
 ;_ldap._tcp		SRV	0 0 389 xayide
-;			SRV	0 0 389 hysbald
 postfix._domainkey	TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB"
 event			CNAME	xayide
 *.event			CNAME	xayide
@@ -290,8 +233,6 @@ _xmpp-server._tcp	SRV	0 0 5269 xayide
 _xmpp-client._tcp	SRV	0 0 5222 xayide
 ;_iax._udp		SRV	0 0 4569 xayide
 ;_sip._udp		SRV	0 0 5060 xayide
-_sip._udp		SRV	0 0 5060 lyng
-_sips._tcp		SRV	0 0 5061 lyng
 _stun._udp		SRV	0 0 3478 xayide
 _stun._tcp		SRV	0 0 3478 xayide
 _stuns._tcp		SRV	0 0 5349 xayide
@@ -420,11 +361,6 @@ wiki		CNAME	coreander
 *.wiki		CNAME	coreander
 trekroner	CNAME	xayide	; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
 *.trekroner	CNAME	xayide
-*.hykrion	CNAME	hykrion
-secure		CNAME	hykrion
-*.secure	CNAME	hykrion
-playingnow	CNAME	hysbald
-*.playingnow	CNAME	hysbald
 steiner		CNAME	xayide
 *.steiner	CNAME	xayide
 admin		CNAME	xayide