Add SPF TXT hints for all public A RRs. Improve comments. Use CNAME for services (they do not need SPF hints).

5 files changed, 148 insertions, 18 deletions

diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index 3e8a2b6..1196c6b 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -6,6 +6,8 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 
+; 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.
@@ -13,6 +15,30 @@ $TTL	604800
 		MX 50	mail.idaa.dk.
 		MX 50	mail.haakansson.com.
 		TXT	"v=spf1 mx -all"
-		A	192.168.222.250 ;80.196.110.134
-*		A	192.168.222.250 ;80.196.110.134
-		TXT	"v=spf1 -all"
+
+; External hosts (use A and TXT-wrapped CNAME or PTR)
+
+; Public local hosts (use A)
+
+; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
+*		CNAME	xayide.jones.dk.
+
+; Public CNAME-mapped PTR records
+
+; Public authentication-related (LDAP and Kerberos) records
+
+; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
+
+; Public local services (use CNAME)
+
+; Private zone roots, mailhubs and non-CNAME services (use A)
+
+; Private hosts (use A)
+
+; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+
+; Private CNAME-mapped PTR records
+
+; Private services (use CNAME)
+
+; Private CNAME-mapped PTR records
diff --git a/bind/fake-222/JONES-mailonly b/bind/fake-222/JONES-mailonly
index 5aad0ac..d06b020 100644
--- a/bind/fake-222/JONES-mailonly
+++ b/bind/fake-222/JONES-mailonly
@@ -6,6 +6,7 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 
+; Public zone roots, mailhubs and non-CNAME services (use A)
 		NS	localhost.
 		MX 10	mail.jones.dk.
 		MX 50	mail.homebase.dk.
@@ -15,3 +16,29 @@ $TTL	604800
 		TXT	"v=spf1 mx -all"
 mail		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 a -all"
+
+; External hosts (use A and TXT-wrapped CNAME or PTR)
+
+; Public local hosts (use A)
+
+; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
+
+; Public CNAME-mapped PTR records
+
+; Public authentication-related (LDAP and Kerberos) records
+
+; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
+
+; Public local services (use CNAME)
+
+; Private zone roots, mailhubs and non-CNAME services (use A)
+
+; Private hosts (use A)
+
+; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+
+; Private CNAME-mapped PTR records
+
+; Private services (use CNAME)
+
+; Private CNAME-mapped PTR records
diff --git a/bind/fake-222/JONES-nomail b/bind/fake-222/JONES-nomail
index aa609fd..e8a7729 100644
--- a/bind/fake-222/JONES-nomail
+++ b/bind/fake-222/JONES-nomail
@@ -6,8 +6,34 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 
-		NS	localhost.
+; Public zone roots, mailhubs and non-CNAME services (use A)
 		A	192.168.222.250 ;80.196.110.134
+		NS	localhost.
 		TXT	"v=spf1 -all"
-*		A	192.168.222.250 ;80.196.110.134
-		TXT	"v=spf1 -all"
+
+; External hosts (use A and TXT-wrapped CNAME or PTR)
+
+; Public local hosts (use A)
+
+; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
+*		CNAME	xayide.jones.dk.
+
+; Public CNAME-mapped PTR records
+
+; Public authentication-related (LDAP and Kerberos) records
+
+; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
+
+; Public local services (use CNAME)
+
+; Private zone roots, mailhubs and non-CNAME services (use A)
+
+; Private hosts (use A)
+
+; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+
+; Private CNAME-mapped PTR records
+
+; Private services (use CNAME)
+
+; Private CNAME-mapped PTR records
diff --git a/bind/fake-222/OFF b/bind/fake-222/OFF
index 7c468b8..db257f1 100644
--- a/bind/fake-222/OFF
+++ b/bind/fake-222/OFF
@@ -6,5 +6,32 @@ $TTL	604800
 			2419200		; Expire
 			 604800 )	; Negative Cache TTL
 
+; Public zone roots, mailhubs and non-CNAME services (use A)
 		NS	localhost.
 		TXT	"v=spf1 -all"
+
+; External hosts (use A and TXT-wrapped CNAME or PTR)
+
+; Public local hosts (use A)
+
+; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
+
+; Public CNAME-mapped PTR records
+
+; Public authentication-related (LDAP and Kerberos) records
+
+; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
+
+; Public local services (use CNAME)
+
+; Private zone roots, mailhubs and non-CNAME services (use A)
+
+; Private hosts (use A)
+
+; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+
+; Private CNAME-mapped PTR records
+
+; Private services (use CNAME)
+
+; Private CNAME-mapped PTR records
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 9260b35..c4098ed 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -8,13 +8,13 @@ $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.
-		A	192.168.222.250 ;80.196.110.134
 		LOC	55 38 N 012 05 E 100m
 		TXT	"v=spf1 mx -all"
 mail		A	192.168.222.250 ;80.196.110.134
@@ -22,6 +22,7 @@ mail		A	192.168.222.250 ;80.196.110.134
 		TXT	"v=spf1 a -all"
 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.
@@ -31,7 +32,9 @@ lists		A	80.68.88.141
 		MX 50	mail.haakansson.com.
 		TXT	"v=spf1 mx -all"
 tun		NS	hykrion
+		TXT	"v=spf1 -all"
 entrescenen	NS	nufnuf
+		TXT	"v=spf1 -all"
 
 ; External hosts (use A and TXT-wrapped CNAME or PTR)
 ida		A	85.81.138.117
@@ -42,6 +45,7 @@ ida		A	85.81.138.117
 		TXT	"PTR=ida.idaa.dk"
 		TXT	"CNAME=0x55518a75.adsl.cybercity.dk"
 		TXT	"Addr=Aarhus"
+		TXT	"v=spf1 -all"
 tulle		A	80.166.107.122
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Owner=Christoffer Haakansson"
@@ -50,7 +54,7 @@ tulle		A	80.166.107.122
 		TXT	"PTR=cpe.atm2-0-54151.0x50a66b7a.arcnxx17.customer.tele.dk"
 		TXT	"CNAME=tulle.haakansson.com"
 		TXT	"Addr=Aarhus"
-; picasso		A	62.243.172.143
+		TXT	"v=spf1 -all"
 picasso		A	87.60.232.172
 		HINFO	"AMD Sempron" "Debian GNU/Linux"
 		TXT	"Owner=Nicolai Wallner"
@@ -59,6 +63,7 @@ picasso		A	87.60.232.172
 		TXT	"PTR=0x3ef3ac8f.bynxx3.adsl-dhcp.tele.dk"
 		TXT	"CNAME=picasso.haakansson.com"
 		TXT	"Addr=Islands Brygge, Copenhagen"
+		TXT	"v=spf1 -all"
 jawa		A	87.57.161.214
 		HINFO	"Intel Pentium IV" "Debian GNU/Linux"
 		TXT	"Owner=Homebase"
@@ -67,6 +72,7 @@ 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
 		HINFO	"User Mode Linux" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones"
@@ -74,6 +80,7 @@ coreander	A	80.68.88.141
 		TXT	"Link=100Mbit"
 		TXT	"PTR=coreander.bitbase.dk"
 		TXT	"Addr=London"
+		TXT	"v=spf1 -all"
 coreander-old	A	83.133.64.38
 		HINFO	"VIA EPIA-800 (Ezra)" "Debian GNU/Linux"
 		TXT	"Owner=Bitbase ApS"
@@ -81,6 +88,7 @@ coreander-old	A	83.133.64.38
 		TXT	"Link=100Mbit"
 		TXT	"PTR=coreander.bitbase.dk"
 		TXT	"Addr=Vesterbro, Copenhagen"
+		TXT	"v=spf1 -all"
 cherry		A	195.184.109.89
 		HINFO	"AMD Duron" "Debian GNU/Linux"
 		TXT	"Owner=Lab"
@@ -89,6 +97,7 @@ cherry		A	195.184.109.89
 		TXT	"PTR=cherry.107b.dk"
 ;		TXT	"CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
 ;		TXT	"Addr=Vesterbro, Copenhagen"
+		TXT	"v=spf1 -all"
 satsbutikken	A	80.160.77.114
 		HINFO	"AMD K6" "Debian GNU/Linux"
 		TXT	"Owner=Satsbutikken"
@@ -97,6 +106,7 @@ satsbutikken	A	80.160.77.114
 		TXT	"PTR=debian.satsbutikken.local"
 		TXT	"CNAME=cpe.atm0-0-0-1151139.0x503e670a.bynxx4.customer.tele.dk"
 		TXT	"Addr=Nyhavn, Copenhagen"
+		TXT	"v=spf1 -all"
 pluto		A	80.166.109.186
 		HINFO	"Intel Celeron" "Debian GNU/Linux"
 		TXT	"Owner=DGI-huset"
@@ -104,6 +114,7 @@ pluto		A	80.166.109.186
 		TXT	"Link=ADSL"
 		TXT	"PTR=pluto.dgi-huset.dk"
 		TXT	"Addr=Aarhus"
+		TXT	"v=spf1 -all"
 nero		A	83.88.159.184
 		HINFO	"AMD Duron" "Debian GNU/Linux"
 		TXT	"Owner=DGI-huset"
@@ -112,6 +123,7 @@ 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"
 tutti		A	83.92.155.37
 		HINFO	"VIA ME6000 (Samuel 2)" "Debian GNU/Linux"
 		TXT	"Owner=Christen Bang-Madsen"
@@ -119,6 +131,7 @@ tutti		A	83.92.155.37
 		TXT	"Link=ADSL"
 		TXT	"PTR=0x535c9b25.hsnxx2.adsl-dhcp.tele.dk"
 		TXT	"Addr=Horsens"
+		TXT	"v=spf1 -all"
 frutti		A	80.62.82.130
 		HINFO	"VIA EPIA-800 (Ezra)" "Debian GNU/Linux"
 		TXT	"Owner=Christen Bang-Madsen"
@@ -126,6 +139,7 @@ frutti		A	80.62.82.130
 		TXT	"Link=ADSL"
 		TXT	"PTR=0x503e5282.hsnxx2.adsl-dhcp.tele.dk"
 		TXT	"Addr=Horsens"
+		TXT	"v=spf1 -all"
 kandinsky	A	195.18.232.142
 		HINFO	"Intel Pentium III" "Debian GNU/Linux"
 		TXT	"Owner=NKS"
@@ -133,6 +147,7 @@ kandinsky	A	195.18.232.142
 		TXT	"Link=??"
 		TXT	"PTR=kandinsky.kaospilot.no"
 		TXT	"Addr=Majorstua, Oslo"
+		TXT	"v=spf1 -all"
 magnatek	A	83.72.192.197
 		HINFO	"Intel Pentium 4" "Debian GNU/Linux"
 		TXT	"Owner=Magnatek"
@@ -140,6 +155,7 @@ magnatek	A	83.72.192.197
 		TXT	"Link=ADSL"
 		TXT	"PTR=83.72.192.197.ip.tele2adsl.dk"
 		TXT	"Addr=Oesterbro, Copenhagen"
+		TXT	"v=spf1 -all"
 nufnuf		A	87.48.106.188
 		HINFO	"Intel Pentium III" "Debian GNU/Linux"
 		TXT	"Owner=Entréscenen"
@@ -147,84 +163,92 @@ nufnuf		A	87.48.106.188
 		TXT	"Link=ADSL"
 		TXT	"PTR=0x57306abc.arcnxx13.adsl-dhcp.tele.dk"
 		TXT	"Addr=Aarhus"
+		TXT	"v=spf1 -all"
 
 ; Public local hosts (use A)
 xayide		A	192.168.222.250 ;80.196.110.134
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		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
 		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
 		HINFO	"PowerPC 7410 (albook)" "Debian GNU/Linux"
 		TXT	"Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
-;hysbald		A	213.83.190.243
+		TXT	"v=spf1 a -all"
 hysbald		A	192.168.222.252 ;80.196.110.134; via xayide.jones.dk
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA C3M266 (fanless Nehemiah)" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		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
 ;		LOC	55 38 N 012 05 E 100m
 ;		HINFO	"VIA EPIA ME6000 (fanless Samuel 2)" "Debian GNU/Linux"
 slamuf		A	192.168.222.251 ;80.196.110.134; via xayide.jones.dk
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA EPIA VE5000 (fanless Samuel 2)" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=Backup 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"
 cairon		A	192.168.222.253 ; 80.196.110.134 ; via xayide.jones.dk
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"Linksys NSLU2" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=Kerberos KDC"
 		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"
-;hykrion		A	62.121.186.250
+		TXT	"v=spf1 a -all"
 hykrion		A	192.168.222.254 ;80.196.110.134; via xayide.jones.dk
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"Via EPIA MS10000E (fanless Nehemiah)" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		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 ;80.196.110.134; via xayide.jones.dk
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"VIA Epia CL6000E (fanless Samuel 2)" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		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"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
 *.mail		CNAME	mail
 *.lists		CNAME	lists
 *.hysbald	CNAME	hysbald
 *.auryn 	A	192.168.0.103
+		TXT	"v=spf1 -all"
 
 ; Public CNAME-mapped PTR records
 ;80.196.110.134	PTR	hykrion
@@ -396,13 +420,13 @@ users		CNAME	coreander
 ; Private hosts (use A)
 airport		A	192.168.222.2
 groab		A	192.168.222.11
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"Apple G3" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=DtP Workstation"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 altsahir	A	192.168.222.12
-		LOC	55 38 N 012 05 E 100m
 		HINFO	"Apple G4" "Debian GNU/Linux"
+		LOC	55 38 N 012 05 E 100m
 		TXT	"Desc=Kitchen infoscreen"
 		TXT	"Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 lp1		A	192.168.222.21