Change main IP for jones.dk to 80.196.110.134 (not 80.196.110.134). Drop ayulala.jones.dk. Adjust reverse records and other additional infofor several hosts.

9 files changed, 65 insertions, 100 deletions

diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index 32d0f64..3e8a2b6 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -13,6 +13,6 @@ $TTL	604800
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
 		TXT	"v=spf1 mx -all"
-		A	192.168.222.250 ;80.166.186.182
-*		A	192.168.222.250 ;80.166.186.182
+		A	192.168.222.250 ;80.196.110.134
+*		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 -all"
diff --git a/bind/fake-222/JONES-mailonly b/bind/fake-222/JONES-mailonly
index c57325d..5aad0ac 100644
--- a/bind/fake-222/JONES-mailonly
+++ b/bind/fake-222/JONES-mailonly
@@ -13,5 +13,5 @@ $TTL	604800
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
 		TXT	"v=spf1 mx -all"
-mail		A	192.168.222.250 ;80.166.186.182
+mail		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 a -all"
diff --git a/bind/fake-222/JONES-nomail b/bind/fake-222/JONES-nomail
index 6ba0b50..aa609fd 100644
--- a/bind/fake-222/JONES-nomail
+++ b/bind/fake-222/JONES-nomail
@@ -7,7 +7,7 @@ $TTL	604800
 			 604800 )	; Negative Cache TTL
 
 		NS	localhost.
-		A	192.168.222.250 ;80.166.186.182
+		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 -all"
-*		A	192.168.222.250 ;80.166.186.182
+*		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 -all"
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index b03410c..4499224 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -14,13 +14,13 @@ $TTL	604800
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
-		A	192.168.222.250 ;80.166.186.182
+		A	192.168.222.250 ;80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 mx -all"
-mail		A	192.168.222.250 ;80.166.186.182
+mail		A	192.168.222.250 ;80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 a -all"
-dns		A	192.168.222.250 ;80.166.186.182
+dns		A	192.168.222.250 ;80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 lists		A	80.68.88.141
 		MX 10	lists.jones.dk.
@@ -149,14 +149,14 @@ nufnuf		A	87.48.106.188
 		TXT	"Addr=Aarhus"
 
 ; Public local hosts (use A)
-xayide		A	192.168.222.250 ;80.166.186.182
+xayide		A	192.168.222.250 ;80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 		TYPE44	\# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
 		TYPE44	\# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
 auryn		A	192.168.222.52
@@ -166,71 +166,59 @@ auryn-old	A	192.168.222.53
 		HINFO	"PowerPC 7410 (albook)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 ;hysbald		A	213.83.190.243
-hysbald		A	192.168.222.252 ;62.243.165.90
+hysbald		A	192.168.222.252 ;80.196.110.134; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA C3M266 (fanless Nehemiah)" "Debian GNU/Linux"
 		TXT	"Desc=Application server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55a.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 		TYPE44	\# 22 01 01 42c039819d2a94fb5379e3bc8fd1a001f316a71e
 		TYPE44	\# 22 02 01 de9694a8c4b0fa8ac7e6d95ea7e7c45b3034ca3f
 ;graograman	A	XXX
 ;		LOC	55 38 N 012 05 E 100m
 ;		HINFO	"VIA EPIA ME6000 (fanless Samuel 2)" "Debian GNU/Linux"
-slamuf		A	192.168.222.251 ;62.243.165.92
+slamuf		A	192.168.222.251 ;80.196.110.134; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
 		TXT	"Desc=Backup server @ MSG"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55c.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-cairon		A	192.168.222.253 ; 80.166.186.182 ; via xayide.jones.dk
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
+cairon		A	192.168.222.253 ; 80.196.110.134 ; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"Linksys NSLU2" "Debian GNU/Linux"
 		TXT	"Desc=Kerberos KDC"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 ;hykrion		A	62.121.186.250
-hykrion		A	192.168.222.254 ;62.243.165.89
+hykrion		A	192.168.222.254 ;80.196.110.134; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"Via EPIA MS10000E (fanless Nehemiah)" "Debian GNU/Linux"
 		TXT	"Desc=Development server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;		TXT	"ISP=Sonofon"
-;		TXT	"Link=WLAN"
-;		TXT	"CNAME=062121186250.sonofon.dk"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a559.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
 		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
-perilin		A	192.168.222.1 ;62.121.186.249
+perilin		A	192.168.222.1 ;80.196.110.134; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA Epia CL6000E (fanless Samuel 2)" "Debian GNU/Linux"
 		TXT	"Desc=Development server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Sonofon"
-		TXT	"Link=WLAN"
-		TXT	"CNAME=062121186249.sonofon.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-uyulala		A	192.168.102.248
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"AMD Duron" "Debian GNU/Linux"
-		TXT	"Desc=Outside firewall @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Unotel"
+		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573b8ce2.ronqu1.broadband.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *.mail		CNAME	mail
@@ -239,10 +227,9 @@ uyulala		A	192.168.102.248
 *.auryn 	A	192.168.0.103
 
 ; Public CNAME-mapped PTR records
-62.243.165.89	PTR	hykrion
-62.243.165.90	PTR	hysbald
-80.166.186.182	PTR	xayide
-87.59.140.117	PTR	uyulala
+;80.196.110.134	PTR	hykrion
+;80.196.110.134	PTR	hysbald
+80.196.110.134	PTR	xayide
 
 ; Public authentication-related (LDAP and Kerberos) records
 kerberos		CNAME	cairon
diff --git a/bind/named.conf.acl b/bind/named.conf.acl
index 21211bf..1039f9f 100644
--- a/bind/named.conf.acl
+++ b/bind/named.conf.acl
@@ -5,7 +5,7 @@ acl jones_slaves {
 	87.57.161.214;	// ns.homebase.dk
 	213.237.80.158;	// ns.107b.dk
 	195.184.109.89;	// temp ns.107b.dk
-	83.95.250.142;	// dns.jones.dk
+	80.196.110.134;	// dns.jones.dk
 	85.81.138.117;	// ns.idraetsdaghojskolen.dk
 	80.166.109.186;	// ns.dgi-huset.dk
 
diff --git a/bind/pri/JONES b/bind/pri/JONES
index 0973959..896f235 100644
--- a/bind/pri/JONES
+++ b/bind/pri/JONES
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	dns.jones.dk.	dr.jones.dk. (
-			2007072201	; serial (2006021901)
+			2007082301	; serial (2006021901)
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -15,6 +15,6 @@ $TTL    3600
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
 		TXT	"v=spf1 mx -all"
-		A	83.95.250.142
-*		A	83.95.250.142
+		A	80.196.110.134
+*		A	80.196.110.134
 		TXT	"v=spf1 -all"
diff --git a/bind/pri/JONES-mailonly b/bind/pri/JONES-mailonly
index 98fe11c..3a7d975 100644
--- a/bind/pri/JONES-mailonly
+++ b/bind/pri/JONES-mailonly
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	dns.jones.dk.	dr.jones.dk. (
-			2007072201	; serial
+			2007082301	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -15,5 +15,5 @@ $TTL    3600
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
 		TXT	"v=spf1 mx -all"
-mail		A	83.95.250.142
+mail		A	80.196.110.134
 		TXT	"v=spf1 a -all"
diff --git a/bind/pri/JONES-nomail b/bind/pri/JONES-nomail
index 55cb200..0340ff2 100644
--- a/bind/pri/JONES-nomail
+++ b/bind/pri/JONES-nomail
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	dns.jones.dk.	dr.jones.dk. (
-			2007072201	; serial (2006021901)
+			2007082301	; serial (2006021901)
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,7 +9,7 @@ $TTL    3600
 		NS	ns.bitbase.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
-		A	83.95.250.142
+		A	80.196.110.134
 		TXT	"v=spf1 -all"
-*		A	83.95.250.142
+*		A	80.196.110.134
 		TXT	"v=spf1 -all"
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 8caa184..17f058c 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -1,6 +1,6 @@
 $TTL	3600
 @		SOA	dns.jones.dk.	dr.jones.dk. (
-			2007081702	; Serial
+			2007082301	; Serial
 			3600		; Refresh
 			1800		; Retry
 			604800		; Expire
@@ -16,13 +16,13 @@ $TTL	3600
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
-		A	83.95.250.142
+		A	80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 mx -all"
-mail		A	83.95.250.142
+mail		A	80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 a -all"
-dns		A	83.95.250.142
+dns		A	80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 lists		A	80.68.88.141
 		MX 10	lists.jones.dk.
@@ -151,14 +151,14 @@ nufnuf		A	87.48.106.188
 		TXT	"Addr=Aarhus"
 
 ; Public local hosts (use A)
-xayide		A	83.95.250.142
+xayide		A	80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 		TYPE44	\# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
 		TYPE44	\# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
 auryn		HINFO	"Intel Core 2 Duo (macbook)" "Debian GNU/Linux"
@@ -166,80 +166,59 @@ auryn		HINFO	"Intel Core 2 Duo (macbook)" "Debian GNU/Linux"
 auryn_old	HINFO	"PowerPC 7410 (albook)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 ;hysbald		A	213.83.190.243
-hysbald		A	62.243.165.90
+hysbald		A	80.196.110.134 ; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA C3M266 (fanless Nehemiah)" "Debian GNU/Linux"
 		TXT	"Desc=Application server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55a.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 		TYPE44	\# 22 01 01 42c039819d2a94fb5379e3bc8fd1a001f316a71e
 		TYPE44	\# 22 02 01 de9694a8c4b0fa8ac7e6d95ea7e7c45b3034ca3f
 ;graograman	A	XXX
 ;		LOC	55 38 N 012 05 E 100m
 ;		HINFO	"VIA EPIA ME6000 (fanless Samuel 2)" "Debian GNU/Linux"
-slamuf		A	87.59.140.226 ; via uyulala.jones.dk
+slamuf		A	80.196.110.134 ; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
 		TXT	"Desc=Backup server @ MSG"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55c.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-cairon		A	83.95.250.142 ; via xayide.jones.dk
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
+cairon		A	80.196.110.134 ; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"Linksys NSLU2" "Debian GNU/Linux"
 		TXT	"Desc=Kerberos KDC"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-;cairon		A	62.243.165.86
-;		LOC	55 38 N 012 05 E 100m
-;		HINFO	"VIA Nehemiah" "Debian GNU/Linux"
-;		TXT	"Desc=Development server @ MSG"
-;		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;		TXT	"ISP=TDC"
-;		TXT	"Link=ADSL"
-;		TXT	"CNAME=0x3ef3a556.virnxx2.adsl-dhcp.tele.dk"
-;		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 ;hykrion		A	62.121.186.250
-hykrion		A	62.243.165.89
+hykrion		A	80.196.110.134 ; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"Via EPIA MS10000E (fanless Nehemiah)" "Debian GNU/Linux"
 		TXT	"Desc=Development server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;		TXT	"ISP=Sonofon"
-;		TXT	"Link=WLAN"
-;		TXT	"CNAME=062121186250.sonofon.dk"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a559.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
 		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
-perilin		A	62.121.186.249
+perilin		A	80.196.110.134 ; via xayide.jones.dk
 		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA Epia CL6000E (fanless Samuel 2)" "Debian GNU/Linux"
 		TXT	"Desc=Development server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Sonofon"
-		TXT	"Link=WLAN"
-		TXT	"CNAME=062121186249.sonofon.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-uyulala		A	87.59.140.226
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"AMD Duron" "Debian GNU/Linux"
-		TXT	"Desc=Outside firewall @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Unotel"
+		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573b8ce2.ronqu1.broadband.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
+		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
+		TXT	"Addr=Mogenstrup, Regstrup"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *.mail		CNAME	mail
@@ -248,10 +227,9 @@ uyulala		A	87.59.140.226
 *.auryn 	A	192.168.0.103
 
 ; Public CNAME-mapped PTR records
-62.243.165.89	PTR	hykrion
-62.243.165.90	PTR	hysbald
-83.95.250.142	PTR	xayide
-87.59.140.117	PTR	uyulala
+;80.196.110.134	PTR	hykrion
+;80.196.110.134	PTR	hysbald
+80.196.110.134	PTR	xayide
 
 ; Public authentication-related (LDAP and Kerberos) records
 kerberos		CNAME	cairon