Reorder records: A→MX→TXT→LOC. Tighten SPF hints. Add 'MX 0 .' for non-MX hosts.

10 files changed, 88 insertions, 60 deletions

diff --git a/bind/pri/COREANDER b/bind/pri/COREANDER
index e588a7f..969dfd4 100644
--- a/bind/pri/COREANDER
+++ b/bind/pri/COREANDER
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2008031201	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,11 +9,12 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
+		A	80.68.88.141
 		MX 10	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		A	80.68.88.141
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 *		A	80.68.88.141
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
diff --git a/bind/pri/COREANDER-jonesmail b/bind/pri/COREANDER-jonesmail
index b30d570..58fa999 100644
--- a/bind/pri/COREANDER-jonesmail
+++ b/bind/pri/COREANDER-jonesmail
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2008081901	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,10 +9,11 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
+		A	80.68.88.141
 		MX 10	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		A	80.68.88.141
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 *		A	80.68.88.141
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
diff --git a/bind/pri/COREANDER-nomail b/bind/pri/COREANDER-nomail
index a15117d..fdbc810 100644
--- a/bind/pri/COREANDER-nomail
+++ b/bind/pri/COREANDER-nomail
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2008092501	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,7 +9,9 @@ $TTL    3600
 		NS	ns.superserver.dk.
 		NS	dns.jones.dk.
 		NS	ns.homebase.dk.
-		TXT	"v=spf1 -all"
 		A	80.68.88.141
+		MX 0	.
+		SPF	"v=spf1 -all"
 *		A	80.68.88.141
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
diff --git a/bind/pri/IDA b/bind/pri/IDA
index 5e954e4..30bfd44 100644
--- a/bind/pri/IDA
+++ b/bind/pri/IDA
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	dr.jones.dk. (
-		2008061101	; serial
+		2009062901	; serial
 		3600		; refresh
 		1800		; retry
 		604800		; expire
@@ -12,15 +12,17 @@ $TTL    3600
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
 		MX 10	ida
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 
 ida		A	85.81.138.117
+		MX 0	.
+		SPF	"v=spf1 -all"
 		LOC	56 10 N 010 13 E 100m
-		TXT	"v=spf1 -all"
 
 coreander	A	80.68.88.141
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"User Mode Linux" "Debian GNU/Linux"
-		TXT	"v=spf1 -all"
 
 mail		CNAME	ida
 vpn		CNAME	ida
diff --git a/bind/pri/OFF b/bind/pri/OFF
index 93366c9..5f33889 100644
--- a/bind/pri/OFF
+++ b/bind/pri/OFF
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2007120501	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,4 +9,5 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
diff --git a/bind/pri/bitbase.dk b/bind/pri/bitbase.dk
index c94a580..128f7b2 100644
--- a/bind/pri/bitbase.dk
+++ b/bind/pri/bitbase.dk
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2008031201	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -11,33 +11,43 @@ $TTL    3600
 		NS	ns.superserver.dk.
 		NS	dns.jones.dk.
 		NS	ns.homebase.dk.
+		A	80.68.88.141
 		MX 10	mail.bitbase.dk.
 ;		MX 50	mail.jones.dk.
 ;		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
-		A	80.68.88.141
+		SPF	"v=spf1 mx -all"
 mail		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		SPF	"v=spf1 a -all"
 www		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 ftp		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 coreander	A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 stats		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 search		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 wiki		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 styles		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 admin		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 ns		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 phone		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
@@ -45,7 +55,8 @@ phone		A	80.68.88.141
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *		A	80.68.88.141
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 
 ; Public CNAME-mapped PTR records
 80.68.88.141	PTR	coreander.bitbase.dk.
diff --git a/bind/pri/borneuni.dk b/bind/pri/borneuni.dk
index 9e7fbd0..1d3cbf6 100644
--- a/bind/pri/borneuni.dk
+++ b/bind/pri/borneuni.dk
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2008092401	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,69 +9,73 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
+		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		A	209.20.88.45
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 team		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 tr		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 bestyrelse	A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 skole		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 elev		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 adm		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 support		A	209.20.88.45
 		MX 10	mail.borneuni.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 bu		A	209.20.88.45
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 mail		A	209.20.88.45
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 www		A	80.68.88.141
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 admin		A	80.68.88.141
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 *.admin		CNAME	admin
 *		CNAME	bu
diff --git a/bind/pri/friis-holm.dk b/bind/pri/friis-holm.dk
index c616bda..278ffea 100644
--- a/bind/pri/friis-holm.dk
+++ b/bind/pri/friis-holm.dk
@@ -9,15 +9,15 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
+		A	80.68.88.141
 		MX 10	mail.bitbase.dk.
 		MX 50	mail.jones.dk.
 		MX 50	mail.dgi-huset.dk.
 		MX 50	mail.homebase.dk.
-		A	80.68.88.141
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 shop		A	81.19.252.30
 		MX 0	.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 -all"
 *		A	80.68.88.141
 		MX 0	.
-		TXT	"v=spf1 -all"
+		SPF	"v=spf1 -all"
diff --git a/bind/pri/haakansson.com b/bind/pri/haakansson.com
index b55eedb..48f9916 100644
--- a/bind/pri/haakansson.com
+++ b/bind/pri/haakansson.com
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	dr.jones.dk. (
-			2008031201	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,19 +9,23 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
+		A	80.166.107.122
 		MX 10	mail.haakansson.com.
 		MX 50	mail.jones.dk.
 		MX 50	mail.bitbase.dk.
 		MX 50	mail.homebase.dk.
-		TXT	"v=spf1 mx -all"
-		A	80.166.107.122
+		SPF	"v=spf1 mx -all"
 mail		A	80.166.107.122
-		TXT	"v=spf1 a -all"
+		SPF	"v=spf1 a -all"
 tulle		A	80.166.107.122
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 www		A	80.166.107.122
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 ftp		A	80.166.107.122
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 test		A	80.166.107.122
-		TXT	"v=spf1 a -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
diff --git a/bind/pri/svalerne.dk b/bind/pri/svalerne.dk
index dc12981..45a9a04 100644
--- a/bind/pri/svalerne.dk
+++ b/bind/pri/svalerne.dk
@@ -1,6 +1,6 @@
 $TTL    3600
 @		SOA	ns.bitbase.dk.	teknik.bitbase.dk. (
-			2007120401	; serial
+			2009062901	; serial
 			3600		; refresh
 			1800		; retry
 			604800		; expire
@@ -9,8 +9,10 @@ $TTL    3600
 		NS	dns.jones.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
+		A	80.68.88.141
 		MX 10	sun.inform.dk.
 		MX 14	antivir.antenna.nl.
 		MX 20	archive.antenna.nl.
-		A	80.68.88.141
 *		A	80.68.88.141
+		MX 0	.
+		SPF	"v=spf1 -all"