Drop unused fake-102 bind branch. Use default-zones.

7 files changed, 5 insertions, 572 deletions

diff --git a/bind/fake-102/JONES b/bind/fake-102/JONES
deleted file mode 100644
index ae588a4..0000000
--- a/bind/fake-102/JONES
+++ /dev/null
@@ -1,17 +0,0 @@
-$TTL	604800
-@		SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-
-		NS	localhost.
-		A	62.243.165.91
-		MX 10	mail.jones.dk.
-		MX 50	mail.bitbase.dk.
-		MX 50	mail.homebase.dk.
-		SPF	"v=spf1 mx -all"
-*		A	62.243.165.91
-		MX 0	.
-		SPF	"v=spf1 -all"
diff --git a/bind/fake-102/JONES-mailonly b/bind/fake-102/JONES-mailonly
deleted file mode 100644
index a8f9323..0000000
--- a/bind/fake-102/JONES-mailonly
+++ /dev/null
@@ -1,16 +0,0 @@
-$TTL	604800
-@		SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-
-		NS	localhost.
-		MX 10	mail.jones.dk.
-		MX 50	mail.bitbase.dk.
-		MX 50	mail.homebase.dk.
-		SPF	"v=spf1 mx -all"
-mail		A	62.243.165.91
-		MX 0	.
-		SPF	"v=spf1 a -all"
diff --git a/bind/fake-102/JONES-nomail b/bind/fake-102/JONES-nomail
deleted file mode 100644
index 7761d98..0000000
--- a/bind/fake-102/JONES-nomail
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL	604800
-@		SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-
-		NS	localhost.
-		A	62.243.165.91
-		MX 0	.
-		SPF	"v=spf1 -all"
-*		A	62.243.165.91
-		MX 0	.
-		SPF	"v=spf1 -all"
diff --git a/bind/fake-102/OFF b/bind/fake-102/OFF
deleted file mode 100644
index 1558b32..0000000
--- a/bind/fake-102/OFF
+++ /dev/null
@@ -1,11 +0,0 @@
-$TTL	604800
-@		SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-
-		NS	localhost.
-		MX 0	.
-		SPF	"v=spf1 -all"
diff --git a/bind/fake-102/jones.dk b/bind/fake-102/jones.dk
deleted file mode 100644
index 960d21e..0000000
--- a/bind/fake-102/jones.dk
+++ /dev/null
@@ -1,470 +0,0 @@
-$TTL	604800
-@		SOA	localhost. root.localhost. (
-			      1		; Serial
-			 604800		; Refresh
-			  86400		; Retry
-			2419200		; Expire
-			 604800 )	; Negative Cache TTL
-
-; Public zone roots, mailhubs and non-CNAME services (use A)
-		NS	localhost.
-		MX 10	mail.jones.dk.
-		MX 50	mail.bitbase.dk.
-		MX 50	mail.homebase.dk.
-		A	62.243.165.91
-		LOC	55 38 N 012 05 E 100m
-		SPF	"v=spf1 mx -all"
-mail		A	62.243.165.91
-		SPF	"v=spf1 a -all"
-		LOC	55 38 N 012 05 E 100m
-dns		A	62.243.165.91
-		MX 0	.
-		SPF	"v=spf1 -all"
-		LOC	55 38 N 012 05 E 100m
-tun		NS	hykrion
-		MX 0	.
-		SPF	"v=spf1 -all"
-entrescenen	NS	nufnuf
-		MX 0	.
-		SPF	"v=spf1 -all"
-
-; External hosts (use A and TXT-wrapped CNAME or PTR)
-ida		A	85.81.138.117
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Pentium III" "Debian GNU/Linux"
-		TXT	"Owner=Idrætsdaghøjskolen i Århus"
-		TXT	"ISP=CyberCity"
-		TXT	"Link=ADSL"
-		TXT	"PTR=ida.idaa.dk"
-		TXT	"CNAME=0x55518a75.adsl.cybercity.dk"
-		TXT	"Addr=Aarhus"
-tulle		A	80.166.107.122
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Celeron" "Debian GNU/Linux"
-		TXT	"Owner=Christoffer Haakansson"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=cpe.atm2-0-54151.0x50a66b7a.arcnxx17.customer.tele.dk"
-		TXT	"CNAME=tulle.haakansson.com"
-		TXT	"Addr=Aarhus"
-; picasso		A	62.243.172.143
-picasso		A	87.60.232.172
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"AMD Sempron" "Debian GNU/Linux"
-		TXT	"Owner=Nicolai Wallner"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=0x3ef3ac8f.bynxx3.adsl-dhcp.tele.dk"
-		TXT	"CNAME=picasso.haakansson.com"
-		TXT	"Addr=Islands Brygge, Copenhagen"
-jawa		A	87.57.161.214
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Pentium IV" "Debian GNU/Linux"
-		TXT	"Owner=Homebase"
-		TXT	"ISP=Sonofon"
-		TXT	"Link=WLAN"
-		TXT	"PTR=jawa.homebase.dk"
-		TXT	"CNAME=062121169066.sonofon.dk"
-		TXT	"Addr=Aarhus"
-coreander	A	83.133.64.38
-		MX 0	.
-		SPF	"v=spf1 a -all"
-		HINFO	"VIA EPIA-800 (Ezra)" "Debian GNU/Linux"
-		TXT	"Owner=Bitbase ApS"
-		TXT	"ISP=LambdaNet"
-		TXT	"Link=100Mbit"
-		TXT	"PTR=coreander.bitbase.dk"
-		TXT	"Addr=Vesterbro, Copenhagen"
-cherry		A	93.176.80.60
-		MX 0	.
-		SPF	"v=spf1 -all"
-		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=Vesterbro, Copenhagen"
-satsbutikken	A	80.160.77.114
-		MX 0	.
-		SPF	"v=spf1 -all"
-		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=Nyhavn, Copenhagen"
-pluto		A	80.166.109.186
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Celeron" "Debian GNU/Linux"
-		TXT	"Owner=DGI-huset"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=pluto.dgi-huset.dk"
-		TXT	"Addr=Aarhus"
-nero		A	83.88.159.184
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"AMD Duron" "Debian GNU/Linux"
-		TXT	"Owner=DGI-huset"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=nero.dgi-huset.dk"
-		TXT	"CNAME=0x53589fb8.arcnxx20.adsl-dhcp.tele.dk"
-		TXT	"Addr=Aarhus"
-tutti		A	83.92.155.37
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"VIA ME6000 (Samuel 2)" "Debian GNU/Linux"
-		TXT	"Owner=Christen Bang-Madsen"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=0x535c9b25.hsnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Horsens"
-frutti		A	80.62.82.130
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"VIA EPIA-800 (Ezra)" "Debian GNU/Linux"
-		TXT	"Owner=Christen Bang-Madsen"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=0x503e5282.hsnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Horsens"
-kandinsky	A	195.18.232.142
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Pentium III" "Debian GNU/Linux"
-		TXT	"Owner=NKS"
-		TXT	"ISP=Banetele AS"
-		TXT	"Link=??"
-		TXT	"PTR=kandinsky.kaospilot.no"
-		TXT	"Addr=Majorstua, Oslo"
-magnatek	A	83.72.192.197
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Pentium 4" "Debian GNU/Linux"
-		TXT	"Owner=Magnatek"
-		TXT	"ISP=Tele2"
-		TXT	"Link=ADSL"
-		TXT	"PTR=83.72.192.197.ip.tele2adsl.dk"
-		TXT	"Addr=Oesterbro, Copenhagen"
-nufnuf		A	87.48.106.188
-		MX 0	.
-		SPF	"v=spf1 -all"
-		HINFO	"Intel Pentium III" "Debian GNU/Linux"
-		TXT	"Owner=Entréscenen"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"PTR=0x57306abc.arcnxx13.adsl-dhcp.tele.dk"
-		TXT	"Addr=Aarhus"
-
-; Public local hosts (use A)
-xayide		A	62.243.165.91
-		MX 0	.
-		SPF	"v=spf1 a -all"
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
-		TYPE44	\# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
-		TYPE44	\# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55f.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-auryn		HINFO	"PowerPC 7410" "Debian GNU/Linux"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;hysbald		A	213.83.190.243
-hysbald		A	192.168.102.252 ;62.243.165.90
-		MX 0	.
-		SPF	"v=spf1 -all"
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"VIA C3M266 (fanless Nehemiah)" "Debian GNU/Linux"
-		TYPE44	\# 22 01 01 42c039819d2a94fb5379e3bc8fd1a001f316a71e
-		TYPE44	\# 22 02 01 de9694a8c4b0fa8ac7e6d95ea7e7c45b3034ca3f
-		TXT	"Desc=Application server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55a.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-;graograman	A	XXX
-;		MX 0	.
-;		SPF	"v=spf1 -all"
-;		LOC	55 38 N 012 05 E 100m
-;		HINFO	"VIA EPIA ME6000 (fanless Samuel 2)" "Debian GNU/Linux"
-slamuf		A	62.243.165.92
-		MX 0	.
-		SPF	"v=spf1 -all"
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
-		TXT	"Desc=Backup server @ MSG"
-		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a55c.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-;cairon		A	62.243.165.86
-;		MX 0	.
-;		SPF	"v=spf1 -all"
-;		LOC	55 38 N 012 05 E 100m
-;		HINFO	"VIA Nehemiah" "Debian GNU/Linux"
-;		TXT	"Desc=Development server @ MSG"
-;		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;		TXT	"ISP=TDC"
-;		TXT	"Link=ADSL"
-;		TXT	"CNAME=0x3ef3a556.virnxx2.adsl-dhcp.tele.dk"
-;		TXT	"Addr=Trekroner, Roskilde"
-;hykrion		A	62.121.186.250
-hykrion		A	192.168.102.254 ;62.243.165.89
-		MX 0	.
-		SPF	"v=spf1 -all"
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"Via EPIA MS10000E (fanless Nehemiah)" "Debian GNU/Linux"
-		TXT	"Desc=Development server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;		TXT	"ISP=Sonofon"
-;		TXT	"Link=WLAN"
-;		TXT	"CNAME=062121186250.sonofon.dk"
-		TXT	"ISP=TDC"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x3ef3a559.virnxx2.adsl-dhcp.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
-		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
-perilin		A	192.168.102.249 ;62.121.186.249
-		MX 0	.
-		SPF	"v=spf1 -all"
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"VIA Epia CL6000E (fanless Samuel 2)" "Debian GNU/Linux"
-		TXT	"Desc=Development server @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Sonofon"
-		TXT	"Link=WLAN"
-		TXT	"CNAME=062121186249.sonofon.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-uyulala		A	192.168.102.248
-		MX 0	.
-		SPF	"v=spf1 -all"
-		LOC	55 38 N 012 05 E 100m
-		HINFO	"AMD Duron" "Debian GNU/Linux"
-		TXT	"Desc=Outside firewall @ MSG"
-		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"ISP=Unotel"
-		TXT	"Link=ADSL"
-		TXT	"CNAME=0x573b8ce2.ronqu1.broadband.tele.dk"
-		TXT	"Addr=Trekroner, Roskilde"
-
-; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
-*.mail		CNAME	mail
-*.hysbald	CNAME	hysbald
-*.auryn 	A	192.168.0.103
-		MX 0	.
-		SPF	"v=spf1 -all"
-
-; Public CNAME-mapped PTR records
-62.243.165.89	PTR	hykrion
-62.243.165.90	PTR	hysbald
-62.243.165.91	PTR	xayide
-87.59.140.117	PTR	uyulala
-
-;; Public authentication-related (LDAP and Kerberos) records
-;kerberos		CNAME	cairon
-;ldap			CNAME	xayide
-;afs			CNAME	slamuf
-;_kerberos		TXT	"JONES.DK"
-;_kerberos-master._udp	SRV	0 0 88 cairon
-;_kerberos-adm._tcp	SRV	0 0 749 cairon
-;_kpasswd._udp		SRV	0 0 464 cairon
-;;_krb524._udp		SRV	0 0 4444 cairon
-;_kerberos._udp		SRV	0 0 88 cairon
-;			SRV	0 0 88 xayide
-;			SRV	0 0 88 hysbald
-;_ldap._tcp		SRV	0 0 389 xayide
-;			SRV	0 0 389 hysbald
-
-; Public misc. records
-jabber			CNAME	xayide
-*.jabber		CNAME	xayide
-_jabber._tcp 		IN SRV 5 0 5269 xayide
-_xmpp-server 		IN SRV 5 0 5269 xayide
-_xmpp-client._tcp	IN SRV 5 0 5222 xayide
-
-; External services (use CNAME to local A, or A and TXT-wrapped CNAME, 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
-msg		CNAME	coreander
-*.msg		CNAME	coreander
-munksoegaard	CNAME	coreander
-*.munksoegaard	CNAME	coreander
-munkesoegaard	CNAME	coreander
-*.munkesoegaard	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
-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 Stephansen" "Desc=Bundproductions"
-*.bund		CNAME	xayide
-ledger		CNAME	xayide
-afp		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
-fest		CNAME	xayide
-*.fest		CNAME	xayide
-floppyfw	CNAME	xayide
-xn--gavekonomi-3cb	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
-*.siri		CNAME	xayide
-asbjorn		CNAME	coreander
-*.asbjorn	CNAME	coreander
-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
-visensvenner	CNAME	xayide
-*.visensvenner	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"
-*.wiki		CNAME	xayide
-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
-*.hykrion	CNAME	hykrion
-secure		CNAME	hykrion
-*.secure	CNAME	hykrion
-playingnow	CNAME	hysbald
-*.playingnow	CNAME	hysbald
-steiner		CNAME	xayide
-*.steiner	CNAME	xayide
-admin		CNAME	xayide
-*.admin		CNAME	xayide
-munkefoto	CNAME	xayide
-*.munkefoto	CNAME	xayide
-munkefotos	CNAME	xayide
-*.munkefotos	CNAME	xayide
-mirrors		CNAME	xayide
-*.mirrors	CNAME	xayide
-humor		CNAME	coreander
-*.humor		CNAME	coreander
-files		CNAME	xayide
-*.files		CNAME	xayide
-log		CNAME	slamuf
-*.log		CNAME	slamuf
-backup		CNAME	slamuf
-*.backup	CNAME	slamuf
-phone		CNAME	hykrion
-shell		CNAME	xayide
-*.shell		CNAME	xayide
-otto		CNAME	xayide
-*.otto		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 CNAME-mapped PTR records
-192.168.222.249	PTR	uyulala
-192.168.222.249	PTR	perilin
-192.168.222.250	PTR	xayide
-192.168.222.251	PTR	slamuf
-192.168.222.252	PTR	hysbald
-192.168.222.254	PTR	hykrion
-
-; Private services (use CNAME)
-proxy		CNAME	hysbald
-
-; Private CNAME-mapped PTR records
diff --git a/bind/named.conf.fake-102 b/bind/named.conf.fake-102
deleted file mode 100644
index 25896d3..0000000
--- a/bind/named.conf.fake-102
+++ /dev/null
@@ -1,24 +0,0 @@
-// private
-
-// dk pending
-
-// int. pending
-
-// dk dns.jones.dk
-zone "anniqa.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Annika Lewis
-zone "annikalewis.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Annika Lewis
-zone "bassballs.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Anders Krøyer
-zone "feliciaweb.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Anders Krøyer
-zone "jones.dk"			{ type master;	file "/etc/local-JONES.DK/bind/fake-102/jones.dk";	allow-transfer { jones_slaves; }; }; // Jones
-zone "kassandra-production.dk"	{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Annika Lewis (owner=Spiff)
-zone "mageloese.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Annette MSG
-zone "peronard.dk"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Michael L.P. (owner=Spiff)
-zone "xn--magelse-u1a.dk"	{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES";		allow-transfer { jones_slaves; }; }; // Annette MSG
-
-// int. dns.jones.dk
-zone "lejlighederinc.org"		{ type master;	file "/etc/local-JONES.DK/bind/fake-102/JONES-nomail";	allow-transfer { jones_slaves; }; }; // Annika Lewis
-zone "xpositionreverse.org"		{ type master;	file "/etc/local-JONES.DK/bind/pri/xpositionreverse.org";	allow-transfer { jones_slaves; }; }; // Annika Lewis
-
-// dk suspended dns.jones.dk
-
-// to-be-dropped dns.jones.dk
diff --git a/bind/named.conf.local b/bind/named.conf.local
index b2306ae..966382d 100644
--- a/bind/named.conf.local
+++ b/bind/named.conf.local
@@ -1,9 +1,7 @@
 include "/etc/local-JONES.DK/bind/named.conf.acl";
-
-view "222" {
+view "internal" {
 	match-clients { 127.0.0.0/24; 192.168.222.0/24; };
 
-	include "/etc/local-COMMON/bind/named_BASE.conf";
 	include "/etc/local-JONES.DK/bind/named.conf.fake-222";
 
 	include "/etc/local-REDPILL.DK/bind/named.conf.BITBASE.DK";
@@ -11,26 +9,14 @@ view "222" {
 	include "/etc/local-REDPILL.DK/bind/named.conf.KOMPONENT.DK";
 	include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK";
 
+	include "/etc/bind/named.conf.default-zones";
 };
-
-view "internal" {
-	match-clients { 192.168.102.0/24; 192.168.101.0/24; };
-
-	include "/etc/local-COMMON/bind/named_BASE.conf";
-	include "/etc/local-JONES.DK/bind/named.conf.fake-102";
-
-	include "/etc/local-REDPILL.DK/bind/named.conf.BITBASE.DK";
-	include "/etc/local-REDPILL.DK/bind/named.conf.HOMEBASE.DK";
-	include "/etc/local-REDPILL.DK/bind/named.conf.KOMPONENT.DK";
-	include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK";
-
-};
-
 view "external" {
 	match-clients { any; };
 	recursion no;
 
-	include "/etc/local-COMMON/bind/named_BASE.conf";
+	include "/etc/bind/zones.rfc1918";
+
 	include "/etc/local-JONES.DK/bind/named.conf.pri";
 
 	include "/etc/local-REDPILL.DK/bind/named.conf.BITBASE.DK";
@@ -38,5 +24,5 @@ view "external" {
 	include "/etc/local-REDPILL.DK/bind/named.conf.KOMPONENT.DK";
 	include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK";
 
-	include "/etc/bind/zones.rfc1918";
+	include "/etc/bind/named.conf.default-zones";
 };