Add hysbald.jones.dk and slamuf.jones.dk to JONES fake setup. Add mail.munksoegaard.dk to all ACLs. Place address last always.

3 files changed, 14 insertions, 16 deletions

diff --git a/bind/fake/jones.dk b/bind/fake/jones.dk
index 67578ed..9f9349c 100644
--- a/bind/fake/jones.dk
+++ b/bind/fake/jones.dk
@@ -20,15 +20,15 @@ fax		MX	10	jawa.homebase.dk.
 auryn		MX	10	mail
 		HINFO	"PowerPC 7410" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-hysbald		A	62.243.165.95
+hysbald		A	192.168.102.252 ; 62.243.165.95
 		MX	10	mail
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Desc=Test server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Addr=Trekroner, Roskilde"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
+		TXT	"Addr=Trekroner, Roskilde"
 dns		A	192.168.102.250	; 62.243.165.95
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
@@ -94,13 +94,12 @@ satsbutikken	A	80.62.103.10
 		TXT	"PTR=debian.satsbutikken.local"
 		TXT	"CNAME=cpe.atm0-0-0-1151139.0x503e670a.bynxx4.customer.tele.dk"
 		TXT	"Addr=Nyhavn, Copenhagen"
-slamuf		A	213.237.80.158
+slamuf		A	192.168.102.251 ; 62.243.165.95
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Tiscali"
+		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"PTR=slamuf.107b.dk"
-		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
+		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
 		TXT	"Addr=Trekroner, Roskilde"
 pluto		A	80.166.109.186
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
@@ -127,10 +126,10 @@ rls		A	80.208.177.2
 xayide		A	192.168.102.250	; 62.243.165.95
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Addr=Vesterbro, Copenhagen"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"CNAME=cpe.atm0-0-0-1161189.0x50a3ddee.bynxx3.customer.tele.dk"
+		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
+		TXT	"Addr=Trekroner, Roskilde"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use CNAME)
 *.mail		CNAME	mail
diff --git a/bind/named.conf.acl b/bind/named.conf.acl
index b61c846..bca9f34 100644
--- a/bind/named.conf.acl
+++ b/bind/named.conf.acl
@@ -4,7 +4,7 @@ acl jones_slaves {
 	212.99.226.250;	// ns.bitbase.dk
 	62.121.169.66;	// ns.homebase.dk
 	213.237.80.158;	// ns.107b.dk
-	62.242.76.162;	// mail.munksoegaard.dk
+	80.63.114.214;	// mail.munksoegaard.dk
 	62.243.165.95;	// dns.jones.dk
 	217.157.178.135;	// ns.idaskolen.dk
 	80.166.109.186;	// ns.dgi-huset.dk
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 6492060..0d98d68 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	dns.jones.dk.	dr.jones.dk. (
-			2004042001	; Serial
+			2004042002	; Serial
 			3600		; Refresh
 			1800		; Retry
 			604800		; Expire
@@ -27,10 +27,10 @@ hysbald		A	62.243.165.95
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Desc=Test server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Addr=Trekroner, Roskilde"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
+		TXT	"Addr=Trekroner, Roskilde"
 dns		A	62.243.165.95
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
@@ -96,13 +96,12 @@ satsbutikken	A	80.62.103.10
 		TXT	"PTR=debian.satsbutikken.local"
 		TXT	"CNAME=cpe.atm0-0-0-1151139.0x503e670a.bynxx4.customer.tele.dk"
 		TXT	"Addr=Nyhavn, Copenhagen"
-slamuf		A	213.237.80.158
+slamuf		A	62.243.165.95
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Tiscali"
+		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
-		TXT	"PTR=slamuf.107b.dk"
-		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
+		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
 		TXT	"Addr=Trekroner, Roskilde"
 pluto		A	80.166.109.186
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
@@ -129,10 +128,10 @@ rls		A	80.208.177.2
 xayide		A	62.243.165.95
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Addr=Trekroner, Roskilde"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
+		TXT	"Addr=Trekroner, Roskilde"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use CNAME)
 *.mail		CNAME	mail