Reorder records: NS→A→MX→SPF→LOC→TYPE44→TXT. Tighten SPF and SRV records. Add 'MX 0 .' for non-MX hosts.

5 files changed, 69 insertions, 51 deletions

diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index ac31170..eaa0623 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -7,13 +7,13 @@ $TTL	604800
 			 604800 )	; Negative Cache TTL
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
-		A	192.168.222.250 ;87.59.24.138
 		NS	localhost.
+		A	192.168.222.250 ;87.59.24.138
 		MX 5	xayide.jones.dk.
 		MX 10	perilin.jones.dk.
 		MX 50	jawa.homebase.dk.
 		MX 50	pluto.dgi-huset.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
diff --git a/bind/fake-222/JONES-mailonly b/bind/fake-222/JONES-mailonly
index 20734e6..bbb6d1c 100644
--- a/bind/fake-222/JONES-mailonly
+++ b/bind/fake-222/JONES-mailonly
@@ -12,7 +12,7 @@ $TTL	604800
 		MX 10	perilin.jones.dk.
 		MX 50	jawa.homebase.dk.
 		MX 50	pluto.dgi-huset.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
diff --git a/bind/fake-222/JONES-nomail b/bind/fake-222/JONES-nomail
index 1d3f7d7..605a790 100644
--- a/bind/fake-222/JONES-nomail
+++ b/bind/fake-222/JONES-nomail
@@ -7,9 +7,10 @@ $TTL	604800
 			 604800 )	; Negative Cache TTL
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
-		A	192.168.222.250 ;87.59.24.138
 		NS	localhost.
-		TXT	"v=spf1 -all"
+		A	192.168.222.250 ;87.59.24.138
+		MX 0	.
+		SPF	"v=spf1 -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
diff --git a/bind/fake-222/OFF b/bind/fake-222/OFF
index db257f1..baaa563 100644
--- a/bind/fake-222/OFF
+++ b/bind/fake-222/OFF
@@ -8,7 +8,8 @@ $TTL	604800
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
 		NS	localhost.
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index fa986ca..cdee74e 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -8,28 +8,34 @@ $TTL	604800
 
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
-		A	192.168.222.250 ;87.59.24.138
 		NS	localhost.
+		A	192.168.222.250 ;87.59.24.138
 		MX 5	xayide.jones.dk.
 		MX 10	perilin.jones.dk.
 		MX 50	jawa.homebase.dk.
 		MX 50	pluto.dgi-huset.dk.
+		SPF	"v=spf1 mx -all"
 		LOC	55 38 N 012 05 E 100m
-		TXT	"v=spf1 mx -all"
+mail		A	192.168.222.250 ;87.59.24.138
+		SPF	"v=spf1 a -all"
 dns		A	192.168.222.250 ;87.59.24.138
+		MX 0	.
+		SPF	"v=spf1 -all"
 		LOC	55 38 N 012 05 E 100m
-		TXT	"v=spf1 -all"
 lists		A	80.68.88.141
 		MX 10	coreander.jones.dk.
 		MX 50	xayide.jones.dk.
 		MX 50	jawa.homebase.dk.
 		MX 50	pluto.dgi-huset.dk.
-		TXT	"v=spf1 mx -all"
+		SPF	"v=spf1 mx -all"
 gate		NS	coreander.jones.dk.
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 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"
@@ -37,16 +43,18 @@ jawa		A	87.57.161.214
 		TXT	"PTR=jawa.homebase.dk"
 		TXT	"CNAME=062121169066.sonofon.dk"
 		TXT	"Addr=Aarhus"
-		TXT	"v=spf1 -all"
 coreander	A	80.68.88.141
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"User Mode Linux" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones"
 		TXT	"ISP=jump.net.uk"
 		TXT	"Link=100Mbit"
 		TXT	"PTR=coreander.bitbase.dk"
 		TXT	"Addr=London"
-		TXT	"v=spf1 -all"
 cherry		A	93.176.80.60
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"AMD Duron" "Debian GNU/Linux"
 		TXT	"Owner=Lab"
 ;		TXT	"ISP=Tiscali"
@@ -54,16 +62,18 @@ cherry		A	93.176.80.60
 		TXT	"PTR=cherry.107b.dk"
 ;		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
 ;		TXT	"Addr=Vesterbro, Copenhagen"
-		TXT	"v=spf1 -all"
 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"
-		TXT	"v=spf1 -all"
 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"
@@ -71,52 +81,60 @@ nero		A	83.88.159.184
 		TXT	"PTR=nero.dgi-huset.dk"
 		TXT	"CNAME=0x53589fb8.arcnxx20.adsl-dhcp.tele.dk"
 		TXT	"Addr=Aarhus"
-		TXT	"v=spf1 -all"
 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"
-		TXT	"v=spf1 -all"
 
 ; Public local hosts (use A)
 xayide		A	192.168.222.250 ;87.59.24.138
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
 		LOC	55 38 N 012 05 E 100m
+		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=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-		TXT	"v=spf1 a -all"
-		TYPE44	\# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
-		TYPE44	\# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
 auryn		A	192.168.222.52
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"Intel Core 2 Duo (macbook)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"v=spf1 a -all"
 auryn-old	A	192.168.222.53
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"PowerPC 7410 (albook)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-		TXT	"v=spf1 a -all"
 hysbald		A	192.168.222.252 ;87.59.24.138; via xayide.jones.dk
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"VIA C3M266 (fanless Nehemiah)" "Debian GNU/Linux"
 		LOC	55 38 N 012 05 E 100m
+		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=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-		TXT	"v=spf1 a -all"
-		TYPE44	\# 22 01 01 42c039819d2a94fb5379e3bc8fd1a001f316a71e
-		TYPE44	\# 22 02 01 de9694a8c4b0fa8ac7e6d95ea7e7c45b3034ca3f
 ;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	192.168.222.251 ;87.59.24.138; via xayide.jones.dk
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
 		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=Backup server @ MSG"
@@ -125,8 +143,9 @@ slamuf		A	192.168.222.251 ;87.59.24.138; via xayide.jones.dk
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-		TXT	"v=spf1 a -all"
 cairon		A	192.168.222.253 ; 87.59.24.138 ; via xayide.jones.dk
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"Linksys NSLU2" "Debian GNU/Linux"
 		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=Kerberos KDC"
@@ -135,20 +154,22 @@ cairon		A	192.168.222.253 ; 87.59.24.138 ; via xayide.jones.dk
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-		TXT	"v=spf1 a -all"
 hykrion		A	192.168.222.254 ;87.59.24.138; via xayide.jones.dk
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"Via EPIA MS10000E (fanless Nehemiah)" "Debian GNU/Linux"
 		LOC	55 38 N 012 05 E 100m
+		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
+		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
 		TXT	"Desc=Development server @ MSG"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 		TXT	"ISP=TDC"
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-		TXT	"v=spf1 a -all"
-		TYPE44	\# 22 01 01 90ee0425dad042c75888a1096c1fe7e6b1056f05
-		TYPE44	\# 22 02 01 b448b97ad701842d0f08d44981d212d0fc9022eb
 perilin		A	192.168.222.1 ;87.59.24.138; via xayide.jones.dk
+		MX 0	.
+		SPF	"v=spf1 -all"
 		HINFO	"VIA Epia CL6000E (fanless Samuel 2)" "Debian GNU/Linux"
 		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=Development server @ MSG"
@@ -157,13 +178,13 @@ perilin		A	192.168.222.1 ;87.59.24.138; via xayide.jones.dk
 		TXT	"Link=ADSL"
 		TXT	"CNAME=0x50c46e86.naenxx3.adsl-dhcp.tele.dk"
 		TXT	"Addr=Mogenstrup, Regstrup"
-		TXT	"v=spf1 a -all"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *.lists		CNAME	lists
 *.hysbald	CNAME	hysbald
 *.auryn 	A	192.168.0.103
-		TXT	"v=spf1 -all"
+		MX 0	.
+		SPF	"v=spf1 -all"
 
 ; Public CNAME-mapped PTR records
 ;87.59.24.138	PTR	hykrion
@@ -172,29 +193,25 @@ perilin		A	192.168.222.1 ;87.59.24.138; via xayide.jones.dk
 
 ;; Public authentication-related (LDAP and Kerberos) records
 ;kerberos		CNAME	cairon
-;kerberos-1		CNAME	xayide
-;kerberos-2		CNAME	hysbald
 ;ldap			CNAME	xayide
-;ldap-1			CNAME	hysbald
 ;afs			CNAME	slamuf
 ;_kerberos		TXT	"JONES.DK"
-;_kerberos-master._udp	SRV	0 0 88 kerberos
-;_kerberos-adm._tcp	SRV	0 0 749 kerberos
-;_kpasswd._udp		SRV	0 0 464 kerberos
-;;_krb524._udp		SRV	0 0 4444 kerberos
-;_kerberos._udp		SRV	0 0 88 kerberos
-;			SRV	0 0 88 kerberos-1
-;			SRV	0 0 88 kerberos-2
-;_ldap._tcp		SRV	0 0 389 ldap
-;			SRV	0 0 389 ldap-1
-;			SRV	0 0 389 ldap-2
+;_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			A	192.168.222.250 ;87.59.24.138 ; xayide
-*.jabber		CNAME	jabber
-_jabber._tcp 		IN SRV 5 0 5269 jabber
-_xmpp-server 		IN SRV 5 0 5269 jabber
-_xmpp-client._tcp	IN SRV 5 0 5222 jabber
+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-old
@@ -208,7 +225,6 @@ msg		CNAME	coreander
 *.msg		CNAME	coreander
 
 ; Public local services (use CNAME)
-mail		CNAME	xayide
 *.mail		CNAME	xayide
 www		CNAME	coreander
 *.www		CNAME	coreander