Avoid TXT with CNAMEs.

1 files changed, 23 insertions, 55 deletions

diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 093d1cf..4193a89 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -97,15 +97,11 @@ satsbutikken	A	80.62.103.10
 
 ; 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"
+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
-		TXT	"Desc=X-klassen ved Mulernes Legatskole"
+xx		CNAME	coreander	; "Desc=X-klassen ved Mulernes Legatskole"
 *.xx		CNAME	coreander
 ezbib		CNAME	coreander
 *.ezbib		CNAME	coreander
@@ -114,8 +110,7 @@ portal		CNAME	coreander
 ez		CNAME	coreander
 *.ez		CNAME	coreander
 dgi-huset	CNAME	coreander
-seb		CNAME	coreander
-		TXT	"Owner=Sebastian Winterø"
+seb		CNAME	coreander	; "Owner=Sebastian Winterø"
 *.seb		CNAME	coreander
 wetware		CNAME	gmork
 contacts	CNAME	argax
@@ -133,16 +128,10 @@ xayide		A	80.163.221.238
 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"
+tasekbera	CNAME	xayide	; "Owner=Chrois" "Desc=Tourism in Koala Lumpur"
+demo		CNAME	xayide	; "Desc=jones.dk temporary demo site"
+*.demo		CNAME	xayide	; "Desc=jones.dk temporary demo site"
+bund		CNAME	xayide	; "Owner=Esben Stepahansen" "Desc=Bundproductions"
 *.bund		CNAME	xayide
 ledger		CNAME	xayide
 anja		CNAME	xayide
@@ -188,16 +177,12 @@ 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	; "Owner=Lars 'Tintin' & trup" "Desc=Teatroglimt"
 *.teatroglimt	CNAME	xayide
-malene		CNAME	xayide
-		TXT	"Desc=Malenes foto-galleri"
+malene		CNAME	xayide	; "Desc=Malenes foto-galleri"
 *.malene	CNAME	xayide
 webmail		CNAME	xayide
-webtools	CNAME	xayide
-		TXT	"Desc=Webtools"
+webtools	CNAME	xayide	; "Desc=Webtools"
 forum		CNAME	xayide
 kalender	CNAME	xayide
 toolbox		CNAME	xayide
@@ -207,48 +192,31 @@ horde		CNAME	xayide
 *.horde		CNAME	xayide
 danmark		CNAME	xayide
 *.danmark	CNAME	xayide
-dbk		CNAME	xayide
-		TXT	"Desc=Den Blaa Kanin"
+dbk		CNAME	xayide	; "Desc=Den Blaa Kanin"
 *.dbk		CNAME	xayide
-nande		CNAME	xayide
-		TXT	"Desc=Nande"
+nande		CNAME	xayide	; "Desc=Nande"
 *.nande		CNAME	xayide
-foto		CNAME	xayide
-		TXT	"Owner=Stine"
-		TXT	"Desc=Nicaragua tur-retur"
+foto		CNAME	xayide	; "Owner=Stine" "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	; "Owner=Ronald Laurits Smedegaard Romlund Jensen" "Desc=MacRonald"
 *.ronald	CNAME	xayide
-jgh		CNAME	xayide
-		TXT	"Owner=Jacob Gorm"
+jgh		CNAME	xayide	; "Owner=Jacob Gorm"
 *.jgh		CNAME	xayide
-lux		CNAME	xayide
-		TXT	"Owner=Christen Stephansen"
+lux		CNAME	xayide	; "Owner=Christen Stephansen"
 *.lux		CNAME	xayide
-conception	CNAME	xayide
-		TXT	"Owner=Jasper"
+conception	CNAME	xayide	; "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	; "Desc=Innovating Europe" "Owner=Katrin Rümenapp" "Email=<kat@kaospilot.dk>"
 *.ie		CNAME	xayide
-craignative	CNAME	xayide
-		TXT	"Owner=Jacob Valdemar"
-wiki		CNAME	xayide
-		TXT	"Desc=jones.dk wiki"
+craignative	CNAME	xayide	; "Owner=Jacob Valdemar"
+wiki		CNAME	xayide	; "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"
+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)