Tidy and beautify: Improve section comments. Drop obsolete hosts saks.jones.dk, gonk.jones.dk, artax.jones.dk, argax.jones.dk. Rename lab.jones.dk to cherry.jones.dk. Add hosts slamuf.jones.dk, pluto.jones.dk. Add HINFO and TXT to all hosts.

1 files changed, 88 insertions, 32 deletions

diff --git a/bind/fake/jones.dk b/bind/fake/jones.dk
index e5d31c6..815725a 100644
--- a/bind/fake/jones.dk
+++ b/bind/fake/jones.dk
@@ -6,7 +6,7 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 
-; Domain roots and Non-CNAME services (those containing NS or MX)
+; Public zone roots, mailhubs and non-CNAME services (use A)
 		NS	localhost.
 		MX	10	mail.jones.dk.
 		MX	50	mail.idaskolen.dk.
@@ -18,61 +18,103 @@ mail		A	10.42.42.42	; 80.163.221.238
 fax		MX	10	jawa.homebase.dk.
 		MX	20	mail
 auryn		MX	10	mail
+		HINFO	"PowerPC 7410" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Link=PPP"
 hysbald		A	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	"Location=Munksoegaard, Roskilde"
+		TXT	"Addr=Munksoegaard, Roskilde"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
-ida		MX	10	ida
-		MX	20	mail
 dns		A	10.42.42.42	; 80.163.221.238
 
-; Star aliases tied to domain roots and non-CNAME services
-*.mail		CNAME	mail
-
-; External hosts (use A and include TXT-wrapped CNAME)
+; External hosts (use A)
 ida		A	217.157.178.135
 		HINFO	"Intel Pentium III" "Debian GNU/Linux"
 		TXT	"Owner=Idrætsdaghøjskolen i Århus"
 		TXT	"ISP=CyberCity"
-		TXT	"A=ida.idraetsdaghojskolen.dk"
-		TXT	"CNAME=port130.ds1-arno.adsl.cybercity.dk"
 		TXT	"Link=ADSL"
+		TXT	"PTR=ida.idraetsdaghojskolen.dk"
+		TXT	"CNAME=port130.ds1-arno.adsl.cybercity.dk"
+		TXT	"Addr=Aarhus"
 tulle		A	80.166.107.122
+		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Owner=Christoffer Haakansson"
-		TXT	"A=tulle.haakansson.com"
+		TXT	"ISP=TDC"
+		TXT	"Link=ADSL"
+		TXT	"PTR=tulle.haakansson.com"
+		TXT	"CNAME=tulle.haakansson.com"
+		TXT	"Addr=Aarhus"
 homebase	A	213.237.36.173
+		HINFO	"Intel Pentium IV" "Debian GNU/Linux"
 		TXT	"Owner=Homebase"
-		TXT	"A=jawa.homebase.dk"
+		TXT	"ISP=Tiscali"
 		TXT	"Link=ADSL"
+		TXT	"PTR=jawa.homebase.dk"
+		TXT	"CNAME=jawa.homebase.dk"
+		TXT	"Addr=Mejlgade, Aarhus"
 coreander	A	212.99.226.250
+		HINFO	"VIA Ezra" "Debian GNU/Linux"
 		TXT	"Owner=Bitbase ApS"
 		TXT	"ISP=Broadcom"
 		TXT	"Link=100Mbit"
+		TXT	"PTR=coreander.bitbase.dk"
+		TXT	"Addr=Vesterbro, Copenhagen"
 rornaestved	A	213.237.34.180
+		HINFO	"AMD K6" "Debian GNU/Linux"
 		TXT	"Owner=Ret&Raad Naestved"
 		TXT	"ISP=Tiscali"
 		TXT	"Link=ADSL"
+		TXT	"PTR=debian.ror.local"
 		TXT	"CNAME=213.237.34.180.adsl.nae.worldonline.dk"
-gonk		A	62.79.74.244
-		TXT	"Owner=Boligforeningen Steenwinkel"
+		TXT	"Addr=Naestved"
+cherry		A	213.237.80.158
+		HINFO	"AMD Duron" "Debian GNU/Linux"
+		TXT	"Owner=Lab"
 		TXT	"ISP=Tiscali"
 		TXT	"Link=ADSL"
-lab		A	213.237.80.158
-		TXT	"Owner=Lab"
-		TXT	"Location=Vesterbrogade 107b, Copenhagen"
-saks		A	193.88.0.228
-		TXT	"Owner=Louiz"
-		TXT	"A=saks.louiz.dk"
-		TXT	"ISP=ALTA"
-artax		A	213.237.80.158
+		TXT	"PTR=cherry.107b.dk"
+		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
+		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
 satsbutikken	A	80.62.103.10
+		HINFO	"AMD K6" "Debian GNU/Linux"
 		TXT	"Owner=Satsbutikken"
+		TXT	"ISP=TDC"
+		TXT	"Link=ADSL"
+		TXT	"PTR=debian.satsbutikken.local"
+		TXT	"CNAME=cpe.atm0-0-0-1151139.0x503e670a.bynxx4.customer.tele.dk"
+		TXT	"Addr=Copenhagen"
+slamuf		A	213.237.80.158
+		HINFO	"AMD Athlon" "Debian GNU/Linux"
+		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
+		TXT	"ISP=Tiscali"
+		TXT	"Link=ADSL"
+		TXT	"PTR=slamuf.107b.dk"
+		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
+		TXT	"Addr=Vesterbrogade 107b, Copenhagen"
+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"
+
+; 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	"ISP=TDC"
+		TXT	"Link=ADSL"
+		TXT	"CNAME=cpe.atm0-0-0-1161189.0x50a3ddee.bynxx3.customer.tele.dk"
+
+; Public wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+*.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
@@ -93,13 +135,23 @@ seb		CNAME	coreander	; "Owner=Sebastian Winterø"
 *.seb		CNAME	coreander
 contacts	CNAME	argax
 
-; Public local hosts (always use A)
-xayide		A	10.42.42.42	; 80.163.221.238
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"Location=Vesterbrogade 50, Copenhagen"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=cpe.atm0-0-0-1161189.0x50a3ddee.bynxx3.customer.tele.dk"
+; External services (use CNAME to local A, or A, 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"
+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
 
 ; Public local services (use CNAME)
 www		CNAME	xayide
@@ -196,6 +248,10 @@ lists		CNAME	coreander	; "Desc=jones.dk mailinglists"
 trekroner	CNAME	xayide	; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
 *.trekroner	CNAME	xayide
 
-; Private hosts (always use A)
+; Private zone roots, mailhubs and non-CNAME services (use A)
+
+; Private hosts (use A)
+
+; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME)
 
-; Private services (always use CNAME)
+; Private services (use CNAME)