Move JONES domains from BITBASE to JONES.

5 files changed, 317 insertions, 26 deletions

diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index 5f94f74..40a7792 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -5,31 +5,31 @@
 // int. pending
 
 // dk ns.bitbase.dk
-zone "11low.dk"			{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Morten Steinbach
-zone "bassballs.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Anders Krøyer
-zone "bawnager.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-mailonly";	allow-transfer { jones_slaves; }; };
-zone "bluepill.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Spiff
-zone "cph-bmx.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Nils Stærk
-zone "cph-squarekitchen.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
-zone "istedgade103.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
-zone "jones.dk"			{ type master;	file "/etc/local-COMMON/bind/BITBASE/jones.dk";		allow-transfer { jones_slaves; }; }; // Jones
-zone "kassandra-production.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; };
-zone "knudemand.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Gorm
-zone "knudemanden.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Gorm
-zone "macronald.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // MacRonald
-zone "nilsstaerk.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Nils Stærk
-zone "nobullshit.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Kent Dahl
-zone "peronard.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Michael L.P.
-zone "public-e.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Sara Gebran
-zone "redpill.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Spiff
-zone "skubforum.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
-zone "sundbykajak.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Gorm
-zone "vesterbronx.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
-zone "vesterkaer.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Morten Steinbak
-zone "vinbar.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
-zone "vinterstemmer.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Troels
+zone "11low.dk"			{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Morten Steinbach
+zone "bassballs.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Anders Krøyer
+zone "bawnager.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-mailonly";	allow-transfer { jones_slaves; }; };
+zone "bluepill.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Spiff
+zone "cph-bmx.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Nils Stærk
+zone "cph-squarekitchen.dk"	{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
+zone "istedgade103.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
+zone "jones.dk"			{ type master;	file "/etc/local-COMMON/bind/JONES/jones.dk";		allow-transfer { jones_slaves; }; }; // Jones
+zone "kassandra-production.dk"	{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; };
+zone "knudemand.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Gorm
+zone "knudemanden.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Gorm
+zone "macronald.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // MacRonald
+zone "nilsstaerk.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Nils Stærk
+zone "nobullshit.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Kent Dahl
+zone "peronard.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Michael L.P.
+zone "public-e.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Sara Gebran
+zone "redpill.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Spiff
+zone "skubforum.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
+zone "sundbykajak.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Gorm
+zone "vesterbronx.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
+zone "vesterkaer.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Morten Steinbak
+zone "vinbar.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // MacRonald
+zone "vinterstemmer.dk"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Troels
 
 // int. ns.bitbase.dk
-zone "craignative.com"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Valdemar
-zone "eyefish.org"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Kent Dahl
-zone "helbak.com"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/JONES";		allow-transfer { jones_slaves; }; }; // MacRonald
+zone "craignative.com"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // Jacob Valdemar
+zone "eyefish.org"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Kent Dahl
+zone "helbak.com"		{ type master;	file "/etc/local-COMMON/bind/JONES/JONES";		allow-transfer { jones_slaves; }; }; // MacRonald
diff --git a/bind/pri/JONES b/bind/pri/JONES
new file mode 100644
index 0000000..e94dc64
--- /dev/null
+++ b/bind/pri/JONES
@@ -0,0 +1,19 @@
+$TTL    3600
+@		IN	SOA	ns.bitbase.dk.	dr.jones.dk. (
+			2004012301	; serial
+			3600		; refresh
+			1800		; retry
+			604800		; expire
+			3600 )		; Negative Cache TTL
+;
+@		IN	NS	ns.bitbase.dk.
+@		IN	NS	dns.jones.dk.
+@		IN	NS	ns.superserver.dk.
+;
+@		IN	MX	10	mail.jones.dk.
+@		IN	MX	50	mail.haakansson.com.
+@		IN	MX	50	mail.idaskolen.dk.
+@		IN	MX	50	mail.bitbase.dk.
+@		IN	MX	50	mail.homebase.dk.
+@		IN	A	80.163.221.238
+*		IN	A	80.163.221.238
diff --git a/bind/pri/JONES-mailonly b/bind/pri/JONES-mailonly
new file mode 100644
index 0000000..a97d686
--- /dev/null
+++ b/bind/pri/JONES-mailonly
@@ -0,0 +1,18 @@
+$TTL    3600
+@		IN	SOA	ns.bitbase.dk.	dr.jones.dk. (
+			2004012301	; serial
+			3600		; refresh
+			1800		; retry
+			604800		; expire
+			3600 )		; Negative Cache TTL
+;
+@		IN	NS	ns.bitbase.dk.
+@		IN	NS	dns.jones.dk.
+@		IN	NS	ns.superserver.dk.
+;
+@		IN	MX	10	mail.jones.dk.
+@		IN	MX	50	mail.haakansson.com.
+@		IN	MX	50	mail.idaskolen.dk.
+@		IN	MX	50	mail.bitbase.dk.
+@		IN	MX	50	mail.homebase.dk.
+mail		IN	A	80.163.221.238
diff --git a/bind/pri/JONES-nomail b/bind/pri/JONES-nomail
new file mode 100644
index 0000000..9f470ab
--- /dev/null
+++ b/bind/pri/JONES-nomail
@@ -0,0 +1,14 @@
+$TTL    3600
+@		IN	SOA	ns.bitbase.dk.	dr.jones.dk. (
+			2003111001	; serial
+			3600		; refresh
+			1800		; retry
+			604800		; expire
+			3600 )		; Negative Cache TTL
+;
+@		IN	NS	ns.bitbase.dk.
+@		IN	NS	ns.superserver.dk.
+@		IN	NS	dns.jones.dk.
+;
+@		IN	A	80.163.221.238
+*		IN	A	80.163.221.238
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
new file mode 100644
index 0000000..2a65a65
--- /dev/null
+++ b/bind/pri/jones.dk
@@ -0,0 +1,240 @@
+$TTL    3600
+@		SOA	dns.jones.dk.	dr.jones.dk. (
+			2004012303	; Serial
+			3600		; Refresh
+			1800		; Retry
+			604800		; Expire
+			3600 )		; Negative Cache TTL
+
+; Public zone roots, mailhubs and non-CNAME services (use A)
+		NS	dns.jones.dk.
+		NS	ns.bitbase.dk.
+		NS	ns.superserver.dk.
+		MX	10	mail.jones.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
+		HINFO	"PowerPC 7410" "Debian GNU/Linux"
+		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
+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	"Addr=Munksoegaard, 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)
+ida		A	217.157.178.135
+		HINFO	"Intel Pentium III" "Debian GNU/Linux"
+		TXT	"Owner=Idrætsdaghøjskolen i Århus"
+		TXT	"ISP=CyberCity"
+		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	"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	"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"
+		TXT	"Addr=Naestved"
+cherry		A	213.237.80.158
+		HINFO	"AMD Duron" "Debian GNU/Linux"
+		TXT	"Owner=Lab"
+		TXT	"ISP=Tiscali"
+		TXT	"Link=ADSL"
+		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	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, 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
+ftp		CNAME	xayide
+ldap		CNAME	xayide
+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
+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	; "Owner=Lars 'Tintin' & trup" "Desc=Teatroglimt"
+*.teatroglimt	CNAME	xayide
+malene		CNAME	xayide	; "Desc=Malenes foto-galleri"
+*.malene	CNAME	xayide
+webmail		CNAME	xayide
+webtools	CNAME	xayide	; "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	; "Desc=Den Blaa Kanin"
+*.dbk		CNAME	xayide
+nande		CNAME	xayide	; "Desc=Nande"
+*.nande		CNAME	xayide
+foto		CNAME	xayide	; "Owner=Stine" "Desc=Nicaragua tur-retur"
+*.foto		CNAME	xayide
+photo		CNAME	xayide
+*.photo		CNAME	xayide
+ronald		CNAME	xayide	; "Owner=Ronald Laurits Smedegaard Romlund Jensen" "Desc=MacRonald"
+*.ronald	CNAME	xayide
+jgh		CNAME	xayide	; "Owner=Jacob Gorm"
+*.jgh		CNAME	xayide
+lux		CNAME	xayide	; "Owner=Christen Stephansen"
+*.lux		CNAME	xayide
+conception	CNAME	xayide	; "Owner=Jasper"
+*.conception	CNAME	xayide
+ie		CNAME	xayide	; "Desc=Innovating Europe" "Owner=Katrin Rümenapp" "Email=<kat@kaospilot.dk>"
+*.ie		CNAME	xayide
+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	; "Desc=jones.dk mailinglists"
+trekroner	CNAME	xayide	; "Desc=Trekronernet.dk wiki" "Owner=Lars Levin-Jensen"
+*.trekroner	CNAME	xayide
+
+; 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 (use CNAME)