Add NS ns.homebase.dk. Add SPF to wildcard. Improved layout.

11 files changed, 117 insertions, 130 deletions

diff --git a/bind/named.conf.pri b/bind/named.conf.pri
index 8409b52..d8a45ee 100644
--- a/bind/named.conf.pri
+++ b/bind/named.conf.pri
@@ -23,7 +23,7 @@ zone "lonesamuelsson.dk"	{ type master;	file "/etc/local-COMMON/bind/BITBASE/BIT
 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-tmp";	allow-transfer { bb_slaves; }; }; // Patientsikkerhed (admin=Patientsikkerhed)
+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
diff --git a/bind/pri/BITBASE b/bind/pri/BITBASE
index 47ff676..65c529d 100644
--- a/bind/pri/BITBASE
+++ b/bind/pri/BITBASE
@@ -1,5 +1,5 @@
 $TTL    3600
-@	IN	SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
+@		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
 			2004051902	; serial
 			3600		; refresh
 			1800		; retry
diff --git a/bind/pri/BITBASE-jonesmail b/bind/pri/BITBASE-jonesmail
index cf0577a..f53f4c7 100644
--- a/bind/pri/BITBASE-jonesmail
+++ b/bind/pri/BITBASE-jonesmail
@@ -1,21 +1,20 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2004051901	; serial
+@		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
+			2004051902	; 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	TXT	"v=spf1 mx -all"
-@		IN	A	83.133.64.38
-mail		IN	A	62.243.165.95
-*		IN	A	83.133.64.38
+		NS	ns.bitbase.dk.
+		NS	dns.jones.dk.
+		NS	ns.superserver.dk.
+		NS	ns.homebase.dk.
+		MX 10	mail.jones.dk.
+		MX 50	mail.haakansson.com.
+		MX 50	mail.idaskolen.dk.
+		MX 50	mail.bitbase.dk.
+		MX 50	mail.homebase.dk.
+		TXT	"v=spf1 mx -all"
+		A	83.133.64.38
+*		A	83.133.64.38
+		TXT	"v=spf1 -all"
diff --git a/bind/pri/BITBASE-nomail b/bind/pri/BITBASE-nomail
index 0a054ec..1329435 100644
--- a/bind/pri/BITBASE-nomail
+++ b/bind/pri/BITBASE-nomail
@@ -1,15 +1,14 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2004051901	; serial
+@		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
+			2004051902	; 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.
-			TXT	"v=spf1 -all"
-;
-@		IN	A	83.133.64.38
-*		IN	A	83.133.64.38
+		NS	ns.bitbase.dk.
+		NS	ns.superserver.dk.
+		NS	dns.jones.dk.
+		TXT	"v=spf1 -all"
+		A	83.133.64.38
+*		A	83.133.64.38
+		TXT	"v=spf1 -all"
diff --git a/bind/pri/BITBASE-tmp b/bind/pri/BITBASE-tmp
deleted file mode 100644
index 7cb7502..0000000
--- a/bind/pri/BITBASE-tmp
+++ /dev/null
@@ -1,20 +0,0 @@
-$TTL    3600
-@		IN	SOA	dns.jones.dk.	teknik.bitbase.dk. (
-			2004051902	; serial
-			3600		; refresh
-			1800		; retry
-			604800		; expire
-			3600 )		; Negative Cache TTL
-
-;		NS	ns.bitbase.dk.
-		NS	dns.jones.dk.
-;		NS	ns.superserver.dk.
-		NS	ns.homebase.dk.
-		MX 10	mail.bitbase.dk.
-		MX 50	mail.jones.dk.
-		MX 50	mail.haakansson.com.
-		MX 50	mail.idaskolen.dk.
-		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
-		A	83.133.64.38
-*		A	83.133.64.38
diff --git a/bind/pri/LINUXPILOT b/bind/pri/LINUXPILOT
index 33dd4d3..db55071 100644
--- a/bind/pri/LINUXPILOT
+++ b/bind/pri/LINUXPILOT
@@ -1,16 +1,17 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2004051901	; serial
+@		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
+			2004051902	; 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.
-			TXT	"v=spf1 -all"
-;
-@		IN	A	83.133.64.38
-home		IN	A	80.208.53.18
-*		IN	A	83.133.64.38
+		NS	ns.bitbase.dk.
+		NS	ns.superserver.dk.
+		NS	dns.jones.dk.
+		NS	ns.homebase.dk.
+		TXT	"v=spf1 -all"
+		A	83.133.64.38
+home		A	80.208.53.18
+		TXT	"v=spf1 -all"
+*		A	83.133.64.38
+		TXT	"v=spf1 -all"
diff --git a/bind/pri/OFF b/bind/pri/OFF
index edfb2c1..acb465c 100644
--- a/bind/pri/OFF
+++ b/bind/pri/OFF
@@ -1,12 +1,12 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2004051101	; serial
+@		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
+			2004051901	; 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.
-			TXT	"v=spf1 -all"
+		NS	ns.bitbase.dk.
+		NS	dns.jones.dk.
+		NS	ns.superserver.dk.
+		NS	ns.homebase.dk.
+		TXT	"v=spf1 -all"
diff --git a/bind/pri/bitbase.dk b/bind/pri/bitbase.dk
index d808549..0d0e634 100644
--- a/bind/pri/bitbase.dk
+++ b/bind/pri/bitbase.dk
@@ -1,32 +1,40 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
+@		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
 			2004051903	; 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	NS	ns.homebase.dk.
-;
-@		IN	MX	10	mail.bitbase.dk.
-@		IN	MX	50	mail.jones.dk.
-@		IN	MX	50	mail.haakansson.com.
-@		IN	MX	50	mail.homebase.dk.
-@		IN	MX	50	mail.idaskolen.dk.
-@		IN	TXT	"v=spf1 mx -all"
-@		IN	A	83.133.64.38
-mail		IN	A	83.133.64.38
-			TXT	"v=spf1 a -all"
-www		IN	A	83.133.64.38
-ftp		IN	A	83.133.64.38
-coreander	IN	A	83.133.64.38
-stats		IN	A	83.133.64.38
-search		IN	A	83.133.64.38
-wiki		IN	A	83.133.64.38
-styles		IN	A	83.133.64.38
-admin		IN	A	83.133.64.38
-ns		IN	A	83.133.64.38
-*		IN	A	83.133.64.38
+		NS	ns.bitbase.dk.
+		NS	ns.superserver.dk.
+		NS	dns.jones.dk.
+		NS	ns.homebase.dk.
+		MX 10	mail.bitbase.dk.
+		MX 50	mail.jones.dk.
+		MX 50	mail.haakansson.com.
+		MX 50	mail.homebase.dk.
+		MX 50	mail.idaskolen.dk.
+		TXT	"v=spf1 mx -all"
+		A	83.133.64.38
+mail		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+www		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+ftp		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+coreander	A	83.133.64.38
+		TXT	"v=spf1 a -all"
+stats		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+search		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+wiki		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+styles		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+admin		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+ns		A	83.133.64.38
+		TXT	"v=spf1 a -all"
+*		A	83.133.64.38
+		TXT	"v=spf1 a -all"
diff --git a/bind/pri/haakansson.com b/bind/pri/haakansson.com
index 31b4a0f..7f2b940 100644
--- a/bind/pri/haakansson.com
+++ b/bind/pri/haakansson.com
@@ -1,26 +1,28 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	dr.jones.dk. (
-			2004050701	; serial
+@		SOA	ns.bitbase.dk.	dr.jones.dk. (
+			2004051901	; 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.haakansson.com.
-@		IN	MX	50	mail.jones.dk.
-@		IN	MX	50	mail.idaskolen.dk.
-@		IN	MX	50	mail.bitbase.dk.
-@		IN	MX	50	mail.homebase.dk.
-@		IN	TXT	"v=spf1 mx -all"
-@		IN	A	80.166.107.122
-mail		IN	A	80.166.107.122
-			TXT	"v=spf1 a -all"
-;
-tulle		IN	A	80.166.107.122
-www		IN	A	80.166.107.122
-ftp		IN	A	80.166.107.122
-test		IN	A	80.166.107.122
+		NS	ns.bitbase.dk.
+		NS	dns.jones.dk.
+		NS	ns.superserver.dk.
+		NS	ns.homebase.dk.
+		MX 10	mail.haakansson.com.
+		MX 50	mail.jones.dk.
+		MX 50	mail.idaskolen.dk.
+		MX 50	mail.bitbase.dk.
+		MX 50	mail.homebase.dk.
+		TXT	"v=spf1 mx -all"
+		A	80.166.107.122
+mail		A	80.166.107.122
+		TXT	"v=spf1 a -all"
+tulle		A	80.166.107.122
+		TXT	"v=spf1 a -all"
+www		A	80.166.107.122
+		TXT	"v=spf1 a -all"
+ftp		A	80.166.107.122
+		TXT	"v=spf1 a -all"
+test		A	80.166.107.122
+		TXT	"v=spf1 a -all"
diff --git a/bind/pri/steenwinkel.dk b/bind/pri/steenwinkel.dk
index 22d31f2..7e00fcf 100644
--- a/bind/pri/steenwinkel.dk
+++ b/bind/pri/steenwinkel.dk
@@ -1,17 +1,16 @@
 $TTL    3600
-@		IN	SOA	ns.bitbase.dk.	dr.jones.dk. (
+@		SOA	ns.bitbase.dk.	dr.jones.dk. (
 			2004050701	; 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.
-			TXT	"v=spf1 -all"
-;
-@		IN	A	62.79.74.244
-;
-gonk		IN	A	62.79.74.244
-www		IN	A	62.79.74.244
+		NS	ns.bitbase.dk.
+		NS	dns.jones.dk.
+		NS	ns.superserver.dk.
+		A	62.79.74.244
+		TXT	"v=spf1 -all"
+gonk		A	62.79.74.244
+		TXT	"v=spf1 -all"
+www		A	62.79.74.244
+		TXT	"v=spf1 -all"
diff --git a/bind/pri/superserver.dk b/bind/pri/superserver.dk
index 781497e..f7a4dc2 100644
--- a/bind/pri/superserver.dk
+++ b/bind/pri/superserver.dk
@@ -1,18 +1,17 @@
 $TTL    3600
-@		IN	SOA	ns.superserver.dk.	teknik.bitbase.dk. (
-			2004051903	; serial
+@		SOA	ns.superserver.dk.	teknik.bitbase.dk. (
+			2004051904	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
 			3600 )		; Negative Cache TTL
-
-; Public zone roots, mailhubs and non-CNAME services (use A)
-;		NS	ns.bitbase.dk.
+		NS	ns.bitbase.dk.
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
 		TXT	"v=spf1 -all"
 		A	83.133.64.38
 ns		A	80.166.109.186
-; Public wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+		TXT	"v=spf1 -all"
 *		A	83.133.64.38
+		TXT	"v=spf1 -all"