Add rls.jones.dk, location for all hosts, syncronize fake domain morely closely.

2 files changed, 43 insertions, 48 deletions

diff --git a/bind/fake/jones.dk b/bind/fake/jones.dk
index 3e89c69..d7cd925 100644
--- a/bind/fake/jones.dk
+++ b/bind/fake/jones.dk
@@ -1,13 +1,13 @@
-$TTL	604800
-@		SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
+$TTL	3600
+@		SOA	dns.jones.dk.	dr.jones.dk. (
+			2004032501	; Serial
+			3600		; Refresh
+			1800		; Retry
+			604800		; Expire
+			3600 )		; Negative Cache TTL
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
-		NS	localhost.
+		NS	dns.jones.dk.
 		MX	10	mail.jones.dk.
 		MX	50	mail.idaskolen.dk.
 		MX	50	mail.haakansson.com.
@@ -25,13 +25,13 @@ 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=Munksoegaard, Roskilde"
+		TXT	"Addr=Trekroner, Roskilde"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
 dns		A	10.42.42.42	; 80.163.221.238
 
-; External hosts (use A)
+; External hosts (use A and TXT-wrapped CNAME or PTR)
 ida		A	217.157.178.135
 		HINFO	"Intel Pentium III" "Debian GNU/Linux"
 		TXT	"Owner=Idrætsdaghøjskolen i Århus"
@@ -55,7 +55,7 @@ jawa		A	213.237.36.173
 		TXT	"Link=ADSL"
 		TXT	"PTR=jawa.homebase.dk"
 		TXT	"CNAME=jawa.homebase.dk"
-		TXT	"Addr=Mejlgade, Aarhus"
+		TXT	"Addr=Aarhus"
 coreander	A	212.99.226.250
 		HINFO	"VIA Ezra" "Debian GNU/Linux"
 		TXT	"Owner=Bitbase ApS"
@@ -85,7 +85,7 @@ cherry		A	213.237.80.158
 		TXT	"Link=ADSL"
 		TXT	"PTR=cherry.107b.dk"
 		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
-		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+		TXT	"Addr=Vesterbro, Copenhagen"
 satsbutikken	A	80.62.103.10
 		HINFO	"AMD K6" "Debian GNU/Linux"
 		TXT	"Owner=Satsbutikken"
@@ -93,7 +93,7 @@ satsbutikken	A	80.62.103.10
 		TXT	"Link=ADSL"
 		TXT	"PTR=debian.satsbutikken.local"
 		TXT	"CNAME=cpe.atm0-0-0-1151139.0x503e670a.bynxx4.customer.tele.dk"
-		TXT	"Addr=Copenhagen"
+		TXT	"Addr=Nyhavn, Copenhagen"
 slamuf		A	213.237.80.158
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
@@ -101,26 +101,33 @@ slamuf		A	213.237.80.158
 		TXT	"Link=ADSL"
 		TXT	"PTR=slamuf.107b.dk"
 		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
-		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+		TXT	"Addr=Trekroner, Roskilde"
 pluto		A	80.166.109.186
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Owner=DGI-huset"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"PTR=pluto.dgi-huset.dk"
-		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+		TXT	"Addr=Vesterbro, Copenhagen"
 binx		A	195.97.163.33
 		HINFO	"VIA Epia-M" "Debian GNU/Linux"
 		TXT	"Owner=Binx Grafik"
 		TXT	"ISP=Songnet.dk"
 		TXT	"Link=E1"
-		TXT	"Addr=Nyhavn 16, Copenhagen"
+		TXT	"Addr=Nyhavn, Copenhagen"
+rls		A	80.208.177.2
+		HINFO	"AMD Duron" "Debian GNU/Linux"
+		TXT	"Owner=Randers Lille Skole"
+		TXT	"ISP=TDC"
+		TXT	"Link=ADSL"
+		TXT	"PTR=pc66.rls-frsk.dk"
+		TXT	"Addr=Randers"
 
 ; Public local hosts (use A)
 xayide		A	10.42.42.42	; 80.163.221.238
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Addr=Vesterbrogade 50, Copenhagen"
+		TXT	"Addr=Vesterbro, Copenhagen"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=cpe.atm0-0-0-1161189.0x50a3ddee.bynxx3.customer.tele.dk"
@@ -129,26 +136,7 @@ xayide		A	10.42.42.42	; 80.163.221.238
 *.mail		CNAME	mail
 *.hysbald	CNAME	hysbald
 
-; External services (use CNAME to local A, or A and include TXT-wrapped CNAME, or CNAME if agreed with partner)
-ror.ronald	CNAME	coreander
-dr		CNAME	coreander	; "Owner=IT-guide dr. Jones /v Jonas Smedegaard" "Desc=IT-guide dr. Jones"
-*.dr		CNAME	coreander	; "Owner=IT-guide dr. Jones /v Jonas Smedegaard"
-home		CNAME	coreander
-*.home		CNAME	coreander
-xx		CNAME	coreander	; "Desc=X-klassen ved Mulernes Legatskole"
-*.xx		CNAME	coreander
-ezbib		CNAME	coreander
-*.ezbib		CNAME	coreander
-portal		CNAME	coreander
-*.portal	CNAME	coreander
-ez		CNAME	coreander
-*.ez		CNAME	coreander
-dgi-huset	CNAME	coreander
-seb		CNAME	coreander	; "Owner=Sebastian Winterø"
-*.seb		CNAME	coreander
-contacts	CNAME	argax
-
-; External services (use CNAME to local A, or A, or CNAME if ok with partner)
+; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
 ror.ronald	CNAME	coreander
 dr		CNAME	coreander	; "Owner=IT-guide dr. Jones /v Jonas Smedegaard" "Desc=IT-guide dr. Jones"
 *.dr		CNAME	coreander	; "Owner=IT-guide dr. Jones /v Jonas Smedegaard"
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 1844338..33e53e7 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	dns.jones.dk.	dr.jones.dk. (
-			2004012902	; Serial
+			2004032501	; Serial
 			3600		; Refresh
 			1800		; Retry
 			604800		; Expire
@@ -27,13 +27,13 @@ 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=Munksoegaard, Roskilde"
+		TXT	"Addr=Trekroner, Roskilde"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
 dns		A	80.163.221.238
 
-; External hosts (use A)
+; External hosts (use A and TXT-wrapped CNAME or PTR)
 ida		A	217.157.178.135
 		HINFO	"Intel Pentium III" "Debian GNU/Linux"
 		TXT	"Owner=Idrætsdaghøjskolen i Århus"
@@ -57,7 +57,7 @@ jawa		A	213.237.36.173
 		TXT	"Link=ADSL"
 		TXT	"PTR=jawa.homebase.dk"
 		TXT	"CNAME=jawa.homebase.dk"
-		TXT	"Addr=Mejlgade, Aarhus"
+		TXT	"Addr=Aarhus"
 coreander	A	212.99.226.250
 		HINFO	"VIA Ezra" "Debian GNU/Linux"
 		TXT	"Owner=Bitbase ApS"
@@ -87,7 +87,7 @@ cherry		A	213.237.80.158
 		TXT	"Link=ADSL"
 		TXT	"PTR=cherry.107b.dk"
 		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
-		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+		TXT	"Addr=Vesterbro, Copenhagen"
 satsbutikken	A	80.62.103.10
 		HINFO	"AMD K6" "Debian GNU/Linux"
 		TXT	"Owner=Satsbutikken"
@@ -95,7 +95,7 @@ satsbutikken	A	80.62.103.10
 		TXT	"Link=ADSL"
 		TXT	"PTR=debian.satsbutikken.local"
 		TXT	"CNAME=cpe.atm0-0-0-1151139.0x503e670a.bynxx4.customer.tele.dk"
-		TXT	"Addr=Copenhagen"
+		TXT	"Addr=Nyhavn, Copenhagen"
 slamuf		A	213.237.80.158
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
@@ -103,26 +103,33 @@ slamuf		A	213.237.80.158
 		TXT	"Link=ADSL"
 		TXT	"PTR=slamuf.107b.dk"
 		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
-		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+		TXT	"Addr=Trekroner, Roskilde"
 pluto		A	80.166.109.186
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Owner=DGI-huset"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"PTR=pluto.dgi-huset.dk"
-		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+		TXT	"Addr=Vesterbro, Copenhagen"
 binx		A	195.97.163.33
 		HINFO	"VIA Epia-M" "Debian GNU/Linux"
 		TXT	"Owner=Binx Grafik"
 		TXT	"ISP=Songnet.dk"
 		TXT	"Link=E1"
-		TXT	"Addr=Nyhavn 16, Copenhagen"
+		TXT	"Addr=Nyhavn, Copenhagen"
+rls		A	80.208.177.2
+		HINFO	"AMD Duron" "Debian GNU/Linux"
+		TXT	"Owner=Randers Lille Skole"
+		TXT	"ISP=TDC"
+		TXT	"Link=ADSL"
+		TXT	"PTR=pc66.rls-frsk.dk"
+		TXT	"Addr=Randers"
 
 ; Public local hosts (use A)
 xayide		A	80.163.221.238
 		HINFO	"AMD Athlon" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Addr=Vesterbrogade 50, Copenhagen"
+		TXT	"Addr=Vesterbro, Copenhagen"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=cpe.atm0-0-0-1161189.0x50a3ddee.bynxx3.customer.tele.dk"
@@ -131,7 +138,7 @@ xayide		A	80.163.221.238
 *.mail		CNAME	mail
 *.hysbald	CNAME	hysbald
 
-; External services (use CNAME to local A, or A, or CNAME if ok with partner)
+; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
 ror.ronald	CNAME	coreander
 dr		CNAME	coreander	; "Owner=IT-guide dr. Jones /v Jonas Smedegaard" "Desc=IT-guide dr. Jones"
 *.dr		CNAME	coreander	; "Owner=IT-guide dr. Jones /v Jonas Smedegaard"