jones.dk cleanup:

Remove all traces of mail2 (too long without access to Pierre Suites - unfortunately).
Add wildcard to all subnet.
Remove argax (last trace of A-Host relationship).
Remove slamuf (Moved to Lab - without access from Internet).
Use TXT and HINFO for descriptions (only partially for now).

1 files changed, 74 insertions, 62 deletions

diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 068b38a..ef97a9c 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -16,51 +16,42 @@ $TTL    3600
 @		IN	MX	50	mail.bitbase.dk.
 @		IN	A	62.79.46.157
 mail		IN	A	62.79.46.157
-;mail2 -> pierre
-;
-www		IN	CNAME	coreander
-ftp		IN	CNAME	xayide
-ldap		IN	CNAME	xayide
 
-; HylaFAX
-fax		IN	MX	10	jawa.homebase.dk.
-fax		IN	MX	20	mail
-fax		IN	MX	20	mail2
+; Hosts
+;;;;;;;;;
 
-; TiBook
-auryn		IN	MX	10	mail
-auryn		IN	MX	20	mail2
-
-; IDA (CyberCity ADSL: port130.ds1-arno.adsl.cybercity.dk)
-ida		IN	A	217.157.178.135
-ida		IN	MX	10	ida
-ida		IN	MX	20	mail
-ida		IN	MX	20	mail2
+ida		A	217.157.178.135
+		HINFO	"Intel Pentium III" "Debian GNU/Linux"
+		TXT	"Owner=Idrætsdaghøjskolen i Århus"
+		TXT	"ISP=CyberCity
+		TXT	"CNAME=port130.ds1-arno.adsl.cybercity.dk"
+		TXT	"Link=ADSL"
 
-; Michael L.P. (Tiscali ADSL: 213.237.88.209.adsl.ynoe.worldonline.dk)
-paf		IN	A	213.237.88.209
+paf		A	213.237.88.209
+		TXT	"Owner=Michael L.P."
+		TXT	"ISP=Tiscali
+		TXT	"CNAME=213.237.88.209.adsl.ynoe.worldonline.dk"
+		TXT	"LINK=ADSL"
 
-; Nikolaj "Negon" Erichsen (Tiscali ADSL: 62.79.71.222.adsl.vbr.worldonline.dk)
-negon		IN	A	62.79.71.222
+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"
 
-; Eskildsgade (Cybercity ADSL: port110.ds1-vbr.adsl.cybercity.dk)
 eskild		IN	A	212.242.58.49
+; Eskildsgade (Cybercity ADSL: port110.ds1-vbr.adsl.cybercity.dk)
 
-; Development
-argax		IN	A	212.130.44.13
-
-; MacRonald
-slamuf		IN	A	195.184.103.108
-
-; SHARED.Dk
-gmork		IN	A	195.192.127.200
+gmork		A	195.192.127.200
+		TXT	"Owner: Designskolen Kolding"
+		TXT	"Provider: TeleDanmark"
+		TXT	"FQDN: gmork.shared.dk"
 
-; haakansson.com
+; tulle.haakansson.com
 tulle		IN	A	62.242.210.184
 
-; Blaagaardsgade
+; Main machine at V74 (Tiscali ADSL: 62.79.46.157.adsl.vbr.worldonline.dk)
 xayide		IN	A	62.79.46.157
-dns		IN	A	213.237.9.231
 
 ; Homebase via ADSL
 homebase	IN	A	213.237.36.173
@@ -71,14 +62,6 @@ coreander	IN	A	213.150.41.151
 ; Vega (ADSL TeleDanmark)
 tansania	IN	A	80.198.165.148
 
-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
-www.ror		IN	CNAME	ror
-
-ror.ronald	IN	A	213.150.41.151
-
 ; ROR Naestved (WOL ADSL: 213.237.34.180.adsl.nae.worldonline.dk)
 rornaestved	IN	A	213.237.34.180
 
@@ -91,8 +74,6 @@ macvaerk	IN	A	195.249.140.194
 ; Pierre Suites, S.F. (DNAI xDSL: 216.15.34.134)
 pierre		IN	A	216.15.34.134
 ;pierre		IN	LOC	37 47 27.460 N 122 24 29.812 W
-mail2		IN	A	216.15.34.134
-
 
 ; Ratdog, S.F. (PacBell ADSL: adsl-63-194-206-41.dsl.snfc21.pacbell.net)
 ratdog		IN	A	63.194.206.41
@@ -104,28 +85,57 @@ cafe3		IN	A	80.254.164.184
 ; 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
+
+ida		IN	MX	10	ida
+ida		IN	MX	20	mail
+
+; Blaagaardsgade
+dns		IN	A	213.237.9.231
+
+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
+*.ror		IN	CNAME	ror
+
+ror.ronald	IN	A	213.150.41.151
+
 ; IT-guide dr. Jones
-dr		IN	CNAME	coreander
-www.dr		IN	CNAME	coreander
+dr		IN	A	213.150.41.151
+*.dr		IN	CNAME	dr
 
-home		IN	CNAME	coreander
+home		IN	A	213.150.41.151
+*.home		IN	CNAME	home
 
 ; X-klassen ved Mulernes Legatskole
-xx		IN	CNAME	coreander
+xx		IN	A	213.150.41.151
+*.xx		IN	CNAME	xx
 
 ; Jacobs ven Chrois i Koala Lumpur
 tasekbera	IN	CNAME	xayide
 
 ; jones.dk portal
-admin.ezbib	IN	A	213.150.41.151
 ezbib		IN	A	213.150.41.151
-www.ezbib	IN	A	213.150.41.151
+*.ezbib		IN	CNAME	ezbib
 portal		IN	A	213.150.41.151
-ez		IN	NS	coreander
+*.portal	IN	CNAME	portal
+ez		IN	A	213.150.41.151
+*.ez		IN	CNAME	ez
 
 ; Esben Stepahansen: Bundproductions
 bund		IN	CNAME	xayide
-www.bund	IN	CNAME	xayide
+*.bund		IN	CNAME	xayide
 
 ledger		IN	CNAME	xayide
 
@@ -173,15 +183,15 @@ wetware		IN	CNAME	gmork
 workingday	IN	CNAME	xayide
 yuffies		IN	CNAME	xayide
 china		IN	CNAME	xayide
-www.china	IN	CNAME	xayide
+*.china		IN	CNAME	xayide
 
 ; Lars "Tintin" & trup
 teatroglimt	IN	CNAME	xayide
-www.teatroglimt	IN	CNAME	xayide
+*.teatroglimt	IN	CNAME	xayide
 
 ; Malenes foto-galleri
 malene		IN	CNAME	xayide
-www.malene	IN	CNAME	xayide
+*.malene	IN	CNAME	xayide
 
 ; Webtools
 webmail		IN	CNAME	xayide
@@ -196,33 +206,35 @@ horde		IN	CNAME	xayide
 
 ; Den Blaa Kanin
 danmark		IN	CNAME	xayide
+*.danmark	IN	CNAME	xayide
 dbk		IN	CNAME	xayide
+*.dbk		IN	CNAME	xayide
 
 ; Nande
 nande		IN	CNAME	xayide
-www.nande	IN	CNAME	xayide
+*.nande		IN	CNAME	xayide
 
 ; Stine, Nicaragua tur-retur
 foto		IN	CNAME	xayide
+*.foto		IN	CNAME	xayide
 photo		IN	CNAME	xayide
-www.foto	IN	CNAME	xayide
-www.photo	IN	CNAME	xayide
+*.photo		IN	CNAME	xayide
 
 ; MacRonald
 ronald		IN	CNAME	xayide
-www.ronald	IN	CNAME	xayide
+*.ronald	IN	CNAME	xayide
 
 ; Jacob Gorm
 jgh		IN	CNAME	xayide
-www.jgh		IN	CNAME	xayide
+*.jgh		IN	CNAME	xayide
 
 ; Christen Stephansen
 lux		IN	CNAME	xayide
-www.lux		IN	CNAME	xayide
+*.lux		IN	CNAME	xayide
 
 ; Jasper
 conception	IN	CNAME	xayide
-www.conception	IN	CNAME	xayide
+*.conception	IN	CNAME	xayide
 
 ; MiH
 bih		IN	CNAME	xayide