Major tidying of jones.dk.

1 files changed, 238 insertions, 243 deletions

diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 9a2a9e5..ff4c9b9 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -1,261 +1,256 @@
 $TTL    3600
-@		IN	SOA	dns.jones.dk.	dr.jones.dk. (
-			2003120501	; serial
-			3600		; refresh
-			1800		; retry
-			604800		; expire
+@		SOA	dns.jones.dk.	dr.jones.dk. (
+			2003120501	; Serial
+			3600		; Refresh
+			1800		; Retry
+			604800		; Expire
 			3600 )		; Negative Cache TTL
-;
-@		IN	NS	dns.jones.dk.
-@		IN	NS	ns.bitbase.dk.
-@		IN	NS	ns.superserver.dk.
-;
-@		IN	MX	10	mail.jones.dk.
-@		IN	MX	50	mail.shared.dk.
-@		IN	MX	50	mail.idaskolen.dk.
-@		IN	MX	50	mail.haakansson.com.
-@		IN	MX	50	mail.bitbase.dk.
-@		IN	MX	50	mail.homebase.dk.
-@		IN	A	80.163.221.238
-mail		IN	A	80.163.221.238
-*.mail		IN	CNAME	mail
-
-; Hosts
-;;;;;;;;;
 
+; Domain root and Non-CNAME services (those containing NS or MX)
+		NS	dns.jones.dk.
+		NS	ns.bitbase.dk.
+		NS	ns.superserver.dk.
+		MX	10	mail.jones.dk.
+		MX	50	mail.shared.dk.
+		MX	50	mail.idaskolen.dk.
+		MX	50	mail.haakansson.com.
+		MX	50	mail.bitbase.dk.
+		MX	50	mail.homebase.dk.
+		A	80.163.221.238
+mail		A	80.163.221.238
+fax		MX	10	jawa.homebase.dk.
+		MX	20	mail
+auryn		MX	10	mail
+		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+		TXT	"Link=PPP"
+hysbald		MX	10	mail
+		TXT	"Test server @ MSG"
+ida		MX	10	ida
+		MX	20	mail
+dns		A	80.163.221.238
+ror		MX	10	ror
+ror		MX	20	mail
+ror		A	212.130.44.18
+ror		LOC	55 30 N 012 05 E 100m
+
+; Star aliases tied to non-CNAME services
+*.mail		CNAME	mail
+*.ror		CNAME	ror
+
+; External hosts (use A and include TXT-wrapped CNAME)
 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"
-
 negon		A	62.79.71.222
 		TXT	"Owner=Nikolaj 'negon' Erichsen"
 		TXT	"ISP=Tiscali"
 		TXT	"CNAME=62.79.71.222.adsl.vbr.worldonline.dk"
 		TXT	"Link=ADSL"
-
-eskild		IN	A	212.242.58.49
-; Eskildsgade (Cybercity ADSL: port110.ds1-vbr.adsl.cybercity.dk)
-
+eskild		A	212.242.58.49
+		TXT	"Owner=unknown"
+		TXT	"Location=Eskildsgade
+		TXT	"ISP=Cybercity"
+		TXT	"Link=ADSL"
+		TXT	"CNAME=port110.ds1-vbr.adsl.cybercity.dk"
 gmork		A	195.192.127.200
 		TXT	"Owner=Designskolen Kolding"
 		TXT	"ISP=TeleDanmark"
 		TXT	"CNAME=gmork.shared.dk"
-
-; tulle.haakansson.com
-tulle		IN	A	80.166.107.122
-
-; Main machine at V50 (TDC ADSL: cpe.atm0-0-0-1161189.0x50a3ddee.bynxx3.customer.tele.dk.)
-xayide		IN	A	80.163.221.238
-
-; Homebase via ADSL
-homebase	IN	A	213.237.36.173
-
-; WebPartner 100Mbit
-coreander	IN	A	212.99.226.250
-
-; Vega (ADSL TeleDanmark)
-tansania	IN	A	80.198.165.148
-
-; ROR Naestved (WOL ADSL: 213.237.34.180.adsl.nae.worldonline.dk)
-rornaestved	IN	A	213.237.34.180
-
-; Steenwinkel (Tiscali ADSL:
-gonk		IN	A	62.79.74.244
-
-; Lab, Vesterbrogade 107b, Copenhagen
-lab		IN	A	213.237.80.158
-
-;
-www		IN	CNAME	xayide
-ftp		IN	CNAME	xayide
-ldap		IN	CNAME	xayide
-
-; HylaFAX
-fax		IN	MX	10	jawa.homebase.dk.
-fax		IN	MX	20	mail
-
-; TiBook
-auryn		IN	MX	10	mail
-
-; Test server @ MSG
-hysbald		IN	MX	10	mail
-
-ida		IN	MX	10	ida
-ida		IN	MX	20	mail
-
-; xayide.jones.dk
-dns		IN	A	80.163.221.238
-
-ror		IN	MX	10	ror
-ror		IN	MX	20	mail
-ror		IN	A	212.130.44.18
-ror		IN	LOC	55 30 N 012 05 E 100m
-*.ror		IN	CNAME	ror
-
-ror.ronald	IN	CNAME	coreander.bitbase.dk.
-
-; IT-guide dr. Jones
-dr		IN	CNAME	coreander.bitbase.dk.
-*.dr		IN	CNAME	dr
-
-home		IN	CNAME	coreander.bitbase.dk.
-*.home		IN	CNAME	home
-
-; X-klassen ved Mulernes Legatskole
-xx		IN	CNAME	coreander.bitbase.dk.
-*.xx		IN	CNAME	xx
-
-; Jacobs ven Chrois i Koala Lumpur
-tasekbera	IN	CNAME	xayide
-
-; jones.dk portal
-ezbib		IN	CNAME	coreander.bitbase.dk.
-*.ezbib		IN	CNAME	ezbib
-portal		IN	CNAME	coreander.bitbase.dk.
-*.portal	IN	CNAME	portal
-ez		IN	CNAME	coreander.bitbase.dk.
-*.ez		IN	CNAME	ez
-
-; jones.dk temporary sites
-demo		IN	A	80.163.221.238
-*.demo		IN	CNAME	demo
-
-; Esben Stepahansen: Bundproductions
-bund		IN	CNAME	xayide
-*.bund		IN	CNAME	xayide
-
-ledger		IN	CNAME	xayide
-
-contacts	IN	CNAME	argax
-
-anja		IN	CNAME	xayide
-dgi-huset	IN	CNAME	coreander
-ane		IN	CNAME	xayide
-ascanius	IN	CNAME	xayide
-automata	IN	CNAME	xayide
-blaagaard	IN	CNAME	xayide
-bos		IN	CNAME	xayide
-cgi		IN	CNAME	xayide
-computersmerter	IN	CNAME	xayide
-christen	IN	CNAME	xayide
-debian		IN	CNAME	xayide
-diskurs		IN	CNAME	xayide
-dive		IN	CNAME	xayide
-felicia		IN	CNAME	xayide
-floppyfw	IN	CNAME	xayide
-gallery		IN	CNAME	pierre
-gaveøkonomi	IN	CNAME	xayide
-gift-economy	IN	CNAME	xayide
-helbak		IN	CNAME	xayide
-iki		IN	CNAME	xayide
-kimkim		IN	CNAME	xayide
-leif		IN	CNAME	xayide
-lichtraum	IN	CNAME	xayide
-lyrik		IN	CNAME	xayide
-morgan		IN	CNAME	xayide
-nicolai		IN	CNAME	xayide
-o2		IN	CNAME	xayide
-ordet		IN	CNAME	xayide
-peronard	IN	CNAME	xayide
-peter		IN	CNAME	xayide
-search		IN	CNAME	xayide
-siri		IN	CNAME	xayide
-soundfactory	IN	CNAME	xayide
-stats		IN	CNAME	xayide
-sundbykajak	IN	CNAME	xayide
-swing		IN	CNAME	xayide
-vestergror	IN	CNAME	xayide
-wap		IN	CNAME	xayide
-wetware		IN	CNAME	gmork
-workingday	IN	CNAME	xayide
-yuffies		IN	CNAME	xayide
-china		IN	CNAME	xayide
-*.china		IN	CNAME	xayide
-ibsen		IN	CNAME	xayide
-*.ibsen		IN	CNAME	xayide
-cvs		IN	CNAME	xayide
-
-; Lars "Tintin" & trup
-teatroglimt	IN	CNAME	xayide
-*.teatroglimt	IN	CNAME	xayide
-
-; Malenes foto-galleri
-malene		IN	CNAME	xayide
-*.malene	IN	CNAME	xayide
-
-; Webtools
-webmail		IN	CNAME	xayide
-webtools	IN	CNAME	xayide
-forum		IN	CNAME	xayide
-kalender	IN	CNAME	xayide
-toolbox		IN	CNAME	xayide
-imp		IN	CNAME	xayide
-*.imp		IN	CNAME	xayide
-horde		IN	CNAME	xayide
-*.horde		IN	CNAME	xayide
-
-; Den Blaa Kanin
-danmark		IN	CNAME	xayide
-*.danmark	IN	CNAME	xayide
-dbk		IN	CNAME	xayide
-*.dbk		IN	CNAME	xayide
-
-; Sebastian Winterø
-seb		IN	CNAME	coreander
-*.seb		IN	CNAME	coreander
-
-; Nande
-nande		IN	CNAME	xayide
-*.nande		IN	CNAME	xayide
-
-; Stine, Nicaragua tur-retur
-foto		IN	CNAME	xayide
-*.foto		IN	CNAME	xayide
-photo		IN	CNAME	xayide
-*.photo		IN	CNAME	xayide
-
-; MacRonald
-ronald		IN	CNAME	xayide
-*.ronald	IN	CNAME	xayide
-
-; Jacob Gorm
-jgh		IN	CNAME	xayide
-*.jgh		IN	CNAME	xayide
-
-; Christen Stephansen
-lux		IN	CNAME	xayide
-*.lux		IN	CNAME	xayide
-
-; Jasper
-conception	IN	CNAME	xayide
-*.conception	IN	CNAME	xayide
-
-; Innovating Europe (Katrin Rümenapp <kat@kaospilot.dk>)
-ie		IN	CNAME	xayide
-*.ie		IN	CNAME	xayide
-
-; Satsbutikken
-satsbutikken	IN	A	80.62.103.10
-
-artax		IN	A	213.237.80.158
-
-; Jacob Valdemar
-craignative	IN	CNAME	xayide
-
-; wiki
-wiki		IN	CNAME	xayide
-viki		IN	CNAME	coreander.bitbase.dk.
-wikki		IN	CNAME	coreander.bitbase.dk.
-vikki		IN	CNAME	coreander.bitbase.dk.
-
-; saks.louiz.dk (ALTA)
-saks		IN	A	193.88.0.228
-
-lists		IN	CNAME	coreander.bitbase.dk.
-
-; Trekronernet.dk - Lars, MSG
-trekroner	IN	CNAME	xayide
-*.trekroner	IN	CNAME	xayide
+tulle		A	80.166.107.122
+		TXT	"Owner=Christoffer Haakansson"
+		TXT	"A=tulle.haakansson.com"
+homebase	A	213.237.36.173
+		TXT	"Owner=Homebase"
+		TXT	"A=jawa.homebase.dk"
+		TXT	"Link=ADSL"
+coreander	A	212.99.226.250
+		TXT	"Owner=Bitbase ApS"
+		TXT	"ISP=Broadcom"
+		TXT	"Link=100Mbit"
+tansania	A	80.198.165.148
+		TXT	"Owner=Vega"
+		TXT	"Link=ADSL"
+		TXT	"ISP=TeleDanmark"
+rornaestved	A	213.237.34.180
+		TXT	"Owner=Ret&Raad Naestved"
+		TXT	"ISP=Tiscali"
+		TXT	"Link=ADSL"
+		TXT	"CNAME=213.237.34.180.adsl.nae.worldonline.dk"
+gonk		A	62.79.74.244
+		TXT	"Owner=Boligforeningen Steenwinkel"
+		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
+satsbutikken	A	80.62.103.10
+		TXT	"Owner=Satsbutikken"
+
+; 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
+		TXT	"Owner=IT-guide dr. Jones /v Jonas Smedegaard"
+		TXT	"Desc=IT-guide dr. Jones"
+*.dr		CNAME	coreander
+		TXT	"Owner=IT-guide dr. Jones /v Jonas Smedegaard"
+home		CNAME	coreander
+*.home		CNAME	coreander
+xx		CNAME	coreander
+		TXT	"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
+		TXT	"Owner=Sebastian Winterø"
+*.seb		CNAME	coreander
+wetware		CNAME	gmork
+contacts	CNAME	argax
+gallery		CNAME	pierre
+
+; Public local hosts (always use A)
+xayide		A	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"
+
+; Public local services (use CNAME)
+www		CNAME	xayide
+ftp		CNAME	xayide
+ldap		CNAME	xayide
+tasekbera	CNAME	xayide
+		TXT	"Owner=Chrois"
+		TXT	"Desc=Tourism in Koala Lumpur"
+demo		CNAME	xayide
+		TXT	"Desc=jones.dk temporary demo site"
+*.demo		CNAME	xayide
+		TXT	"Desc=jones.dk temporary demo site"
+bund		CNAME	xayide
+		TXT	"Owner=Esben Stepahansen"
+		TXT	"Desc=Bundproductions"
+*.bund		CNAME	xayide
+ledger		CNAME	xayide
+anja		CNAME	xayide
+ane		CNAME	xayide
+ascanius	CNAME	xayide
+automata	CNAME	xayide
+blaagaard	CNAME	xayide
+bos		CNAME	xayide
+cgi		CNAME	xayide
+computersmerter	CNAME	xayide
+christen	CNAME	xayide
+debian		CNAME	xayide
+diskurs		CNAME	xayide
+dive		CNAME	xayide
+felicia		CNAME	xayide
+floppyfw	CNAME	xayide
+gaveøkonomi	CNAME	xayide
+gift-economy	CNAME	xayide
+helbak		CNAME	xayide
+iki		CNAME	xayide
+kimkim		CNAME	xayide
+leif		CNAME	xayide
+lichtraum	CNAME	xayide
+lyrik		CNAME	xayide
+morgan		CNAME	xayide
+nicolai		CNAME	xayide
+o2		CNAME	xayide
+ordet		CNAME	xayide
+peronard	CNAME	xayide
+peter		CNAME	xayide
+search		CNAME	xayide
+siri		CNAME	xayide
+soundfactory	CNAME	xayide
+stats		CNAME	xayide
+sundbykajak	CNAME	xayide
+swing		CNAME	xayide
+vestergror	CNAME	xayide
+wap		CNAME	xayide
+workingday	CNAME	xayide
+yuffies		CNAME	xayide
+china		CNAME	xayide
+*.china		CNAME	xayide
+ibsen		CNAME	xayide
+*.ibsen		CNAME	xayide
+cvs		CNAME	xayide
+teatroglimt	CNAME	xayide
+		TXT	"Owner=Lars 'Tintin' & trup"
+		TXT	"Desc=Teatroglimt"
+*.teatroglimt	CNAME	xayide
+malene		CNAME	xayide
+		TXT	"Desc=Malenes foto-galleri"
+*.malene	CNAME	xayide
+webmail		CNAME	xayide
+webtools	CNAME	xayide
+		TXT	"Desc=Webtools"
+forum		CNAME	xayide
+kalender	CNAME	xayide
+toolbox		CNAME	xayide
+imp		CNAME	xayide
+*.imp		CNAME	xayide
+horde		CNAME	xayide
+*.horde		CNAME	xayide
+danmark		CNAME	xayide
+*.danmark	CNAME	xayide
+dbk		CNAME	xayide
+		TXT	"Desc=Den Blaa Kanin"
+*.dbk		CNAME	xayide
+nande		CNAME	xayide
+		TXT	"Desc=Nande"
+*.nande		CNAME	xayide
+foto		CNAME	xayide
+		TXT	"Owner=Stine"
+		TXT	"Desc=Nicaragua tur-retur"
+*.foto		CNAME	xayide
+photo		CNAME	xayide
+*.photo		CNAME	xayide
+ronald		CNAME	xayide
+		TXT	"Owner=Ronald Laurits Smedegaard Romlund Jensen"
+		TXT	"Desc=MacRonald"
+*.ronald	CNAME	xayide
+jgh		CNAME	xayide
+		TXT	"Owner=Jacob Gorm"
+*.jgh		CNAME	xayide
+lux		CNAME	xayide
+		TXT	"Owner=Christen Stephansen"
+*.lux		CNAME	xayide
+conception	CNAME	xayide
+		TXT	"Owner=Jasper"
+*.conception	CNAME	xayide
+ie		CNAME	xayide
+		TXT	"Desc=Innovating Europe"
+		TXT	"Owner=Katrin Rümenapp"
+		TXT	"Email=<kat@kaospilot.dk>"
+*.ie		CNAME	xayide
+craignative	CNAME	xayide
+		TXT	"Owner=Jacob Valdemar"
+wiki		CNAME	xayide
+		TXT	"Desc=jones.dk wiki"
+viki		CNAME	coreander
+wikki		CNAME	coreander
+vikki		CNAME	coreander
+lists		CNAME	coreander
+		TXT	"Desc=jones.dk mailinglists"
+trekroner	CNAME	xayide
+		TXT	"Desc=Trekronernet.dk wiki"
+		TXT	"Owner=Lars Levin-Jensen"
+*.trekroner	CNAME	xayide
+
+; Private hosts (always use A)
+
+; Private services (always use CNAME)