Use canonical hostnames (not mail.DOMAIN) as MX references.

6 files changed, 48 insertions, 42 deletions

diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index 1196c6b..2795dc2 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -9,11 +9,12 @@ $TTL	604800
 ; Public zone roots, mailhubs and non-CNAME services (use A)
 		A	192.168.222.250 ;80.196.110.134
 		NS	localhost.
-		MX 10	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 5	xayide.jones.dk.
+		MX 10	perilin.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		TXT	"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 d06b020..9946b96 100644
--- a/bind/fake-222/JONES-mailonly
+++ b/bind/fake-222/JONES-mailonly
@@ -8,11 +8,12 @@ $TTL	604800
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
 		NS	localhost.
-		MX 10	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 5	xayide.jones.dk.
+		MX 10	perilin.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		TXT	"v=spf1 mx -all"
 mail		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 a -all"
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index c4098ed..a97272a 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -10,11 +10,12 @@ $TTL	604800
 ; Public zone roots, mailhubs and non-CNAME services (use A)
 		A	192.168.222.250 ;80.196.110.134
 		NS	localhost.
-		MX 10	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 5	xayide.jones.dk.
+		MX 10	perilin.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 mx -all"
 mail		A	192.168.222.250 ;80.196.110.134
@@ -24,12 +25,12 @@ dns		A	192.168.222.250 ;80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 -all"
 lists		A	80.68.88.141
-		MX 10	lists.jones.dk.
-		MX 50	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 10	coreander.jones.dk.
+		MX 50	xayide.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		TXT	"v=spf1 mx -all"
 tun		NS	hykrion
 		TXT	"v=spf1 -all"
diff --git a/bind/pri/JONES b/bind/pri/JONES
index 45ed286..18ea241 100644
--- a/bind/pri/JONES
+++ b/bind/pri/JONES
@@ -12,11 +12,12 @@ $TTL    3600
 		NS	ns.bitbase.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
-		MX 10	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 5	xayide.jones.dk.
+		MX 10	perilin.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		TXT	"v=spf1 mx -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
diff --git a/bind/pri/JONES-mailonly b/bind/pri/JONES-mailonly
index 6be8883..be8d003 100644
--- a/bind/pri/JONES-mailonly
+++ b/bind/pri/JONES-mailonly
@@ -11,11 +11,12 @@ $TTL    3600
 		NS	ns.bitbase.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
-		MX 10	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 5	xayide.jones.dk.
+		MX 10	perilin.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		TXT	"v=spf1 mx -all"
 mail		A	80.196.110.134
 		TXT	"v=spf1 a -all"
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 6f04b56..3d4be1d 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -12,11 +12,12 @@ $TTL	3600
 		NS	ns.bitbase.dk.
 		NS	ns.superserver.dk.
 		NS	ns.homebase.dk.
-		MX 10	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 5	xayide.jones.dk.
+		MX 10	perilin.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 mx -all"
 mail		A	80.196.110.134
@@ -26,12 +27,12 @@ dns		A	80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 -all"
 lists		A	80.68.88.141
-		MX 10	lists.jones.dk.
-		MX 50	mail.jones.dk.
-		MX 50	mail.homebase.dk.
-		MX 50	mail.dgi-huset.dk.
-		MX 50	mail.idaa.dk.
-		MX 50	mail.haakansson.com.
+		MX 10	coreander.jones.dk.
+		MX 50	xayide.jones.dk.
+		MX 50	jawa.homebase.dk.
+		MX 50	pluto.dgi-huset.dk.
+		MX 50	ida.idaa.dk.
+		MX 50	tulle.haakansson.com.
 		TXT	"v=spf1 mx -all"
 tun		NS	hykrion
 		TXT	"v=spf1 -all"