Namespace change: BITBASE -> BITBASE.DK (and others...).

2 files changed, 45 insertions, 44 deletions

diff --git a/bind/named.conf.local b/bind/named.conf.local
index 389cb75..7a8c3b7 100644
--- a/bind/named.conf.local
+++ b/bind/named.conf.local
@@ -1,12 +1,13 @@
-include "/etc/local-COMMON/bind/named_BITBASE_acl.conf";
-include "/etc/local-COMMON/bind/named_IDA_acl.conf";
-include "/etc/local-COMMON/bind/named_LAB_acl.conf";
-include "/etc/local-COMMON/bind/named_CONDUCT_acl.conf";
+include "/etc/local-BITBASE.DK/bind/named.conf.acl";
+include "/etc/local-IDRAETSDAGHOJSKOLEN.DK/bind/named.conf.acl";
+include "/etc/local-KOMPONENT.DK/bind/named.conf.acl";
+include "/etc/local-CONDUCT.DK/bind/named.conf.acl";
 
-include "/etc/local-COMMON/bind/named_BITBASE_pri.conf";
-include "/etc/local-COMMON/bind/named_JONES_sec.conf";
-include "/etc/local-COMMON/bind/named_HOMEBASE_sec.conf";
-include "/etc/local-COMMON/bind/named_IDA_pri.conf";
-include "/etc/local-COMMON/bind/named_LAB_pri.conf";
-include "/etc/local-COMMON/bind/named_CONDUCT_pri.conf";
-include "/etc/local-COMMON/bind/named_DGIH_sec.conf";
+include "/etc/local-BITBASE.DK/bind/named.conf.pri";
+include "/etc/local-IDRAETSDAGHOJSKOLEN.DK/bind/named.conf.pri";
+include "/etc/local-KOMPONENT.DK/bind/named.conf.pri";
+include "/etc/local-CONDUCT.DK/bind/named.conf.pri";
+
+include "/etc/local-REDPILL.DK/bind/named.conf.JONES.DK";
+include "/etc/local-REDPILL.DK/bind/named.conf.HOMEBASE.DK";
+include "/etc/local-REDPILL.DK/bind/named.conf.DGI-HUSET.DK";
diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index 8b83fb7..82e2eba 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -5,43 +5,43 @@
 // int. pending
 
 // dk ns.bitbase.dk
-zone "3rdculture.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // MacRonald (billing=Spiff)
-zone "adakrem.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // MacRonald (admin=NettoNet)
-zone "altnet.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // AltNet (admin=Jesper)
-zone "biks.dk"			{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // MacRonald (admin=Ronald)
-zone "bitbabe.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Spiff
-zone "bitbase.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/bitbase.dk";	allow-transfer { bb_slaves; }; }; // Spiff
-zone "boerneuniversitetet.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // MacRonald (admin=Ronald)
-zone "bygalternativt.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Lone Samuelsson
-zone "electrohype.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Maria Minard (admin=Maria)
-zone "freespace-cph.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Maria Minard (admin=Maria)
-zone "icas.dk"			{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Cockpit
-zone "linuxpiloterne.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/LINUXPILOT";	allow-transfer { bb_slaves; }; }; // MacRonald
-zone "livskunsten.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Christen Hansen
-zone "lonesamuelsson.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Lone Samuelsson
-zone "minard.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Maria Minard (admin=Maria)
-zone "netcommunity.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/OFF";		allow-transfer { bb_slaves; }; }; // Conduct (owner+billing=Spiff)
-zone "nicolaiwallner.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Nicolai Wallner (admin=Nicolai)
-zone "patientsikkerhed.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Patientsikkerhed (admin=Patientsikkerhed)
-zone "pedelakademiet.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Spiff
-zone "resolution.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Jesper Olsen
-zone "sserver.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Spiff
-zone "starquality.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // AltNet (admin=Jesper)
-zone "thirdculture.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // MacRonald (billing=Spiff)
-zone "tinghaven.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-nomail";	allow-transfer { bb_slaves; }; }; // Lone Samuelsson
-zone "webcommunity.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/OFF";		allow-transfer { bb_slaves; }; }; // Conduct (owner+billing=Spiff)
+zone "3rdculture.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // MacRonald (billing=Spiff)
+zone "adakrem.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // MacRonald (admin=NettoNet)
+zone "altnet.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // AltNet (admin=Jesper)
+zone "biks.dk"			{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // MacRonald (admin=Ronald)
+zone "bitbabe.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Spiff
+zone "bitbase.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/bitbase.dk";		allow-transfer { bb_slaves; }; }; // Spiff
+zone "boerneuniversitetet.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // MacRonald (admin=Ronald)
+zone "bygalternativt.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Lone Samuelsson
+zone "electrohype.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Maria Minard (admin=Maria)
+zone "freespace-cph.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Maria Minard (admin=Maria)
+zone "icas.dk"			{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Cockpit
+zone "linuxpiloterne.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/LINUXPILOT";		allow-transfer { bb_slaves; }; }; // MacRonald
+zone "livskunsten.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Christen Hansen
+zone "lonesamuelsson.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Lone Samuelsson
+zone "minard.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Maria Minard (admin=Maria)
+zone "netcommunity.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/OFF";			allow-transfer { bb_slaves; }; }; // Conduct (owner+billing=Spiff)
+zone "nicolaiwallner.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Nicolai Wallner (admin=Nicolai)
+zone "patientsikkerhed.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Patientsikkerhed (admin=Patientsikkerhed)
+zone "pedelakademiet.dk"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Spiff
+zone "resolution.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Jesper Olsen
+zone "sserver.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Spiff
+zone "starquality.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // AltNet (admin=Jesper)
+zone "thirdculture.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // MacRonald (billing=Spiff)
+zone "tinghaven.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-nomail";		allow-transfer { bb_slaves; }; }; // Lone Samuelsson
+zone "webcommunity.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/OFF";			allow-transfer { bb_slaves; }; }; // Conduct (owner+billing=Spiff)
 
 // int. ns.bitbase.dk
-zone "haakansson.com"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/haakansson.com";	allow-transfer { bb_slaves; }; }; // Christoffer Haakansson (reg=TotalReg)
-zone "nicolaiwallner.com"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Nicolai Wallner (reg=TotalReg)
-zone "nord-utte.org"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE-jonesmail";	allow-transfer { bb_slaves; }; }; // Spiff (reg=TotalReg)
-zone "taekkemand.net"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/BITBASE";		allow-transfer { bb_slaves; }; }; // Thomas Melbye
+zone "haakansson.com"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/haakansson.com";		allow-transfer { bb_slaves; }; }; // Christoffer Haakansson (reg=TotalReg)
+zone "nicolaiwallner.com"	{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Nicolai Wallner (reg=TotalReg)
+zone "nord-utte.org"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE-jonesmail";	allow-transfer { bb_slaves; }; }; // Spiff (reg=TotalReg)
+zone "taekkemand.net"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/BITBASE";			allow-transfer { bb_slaves; }; }; // Thomas Melbye
 
 // dk suspended ns.bitbase.dk
 
 // to-be-dropped ns.bitbase.dk
 // annet.dk (admin=Spiff)
-zone "ascii33.org"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/OFF";		allow-transfer { bb_slaves; }; }; // ASCII33
-zone "dekadentfilm.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/OFF";		allow-transfer { bb_slaves; }; }; // Sebastian Winterø
-zone "gangstafilm.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/OFF";		allow-transfer { bb_slaves; }; }; // Sebastian Winterø
-zone "steenwinkel.dk"		{ type master;	file "/etc/local-COMMON/bind/BITBASE/steenwinkel.dk";	allow-transfer { bb_slaves; }; }; // Terramare
+zone "ascii33.org"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/OFF";			allow-transfer { bb_slaves; }; }; // ASCII33
+zone "dekadentfilm.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/OFF";			allow-transfer { bb_slaves; }; }; // Sebastian Winterø
+zone "gangstafilm.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/OFF";			allow-transfer { bb_slaves; }; }; // Sebastian Winterø
+zone "steenwinkel.dk"		{ type master;	file "/etc/local-BITBASE.DK/bind/pri/steenwinkel.dk";		allow-transfer { bb_slaves; }; }; // Terramare