consistently declare host for initial non-skeleton entry; fixes jones.dk hosts fsub1 graograman perilin slamuf polluted by graograman hydorn koreander morla singed teeny

25 files changed, 46 insertions, 46 deletions

diff --git a/bind/fake-222/JONES b/bind/fake-222/JONES
index 7a6ffdc..74f33a4 100644
--- a/bind/fake-222/JONES
+++ b/bind/fake-222/JONES
@@ -5,6 +5,6 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME *
diff --git a/bind/fake-222/JONES-cloud-www b/bind/fake-222/JONES-cloud-www
index 15a3d66..90b16b8 100644
--- a/bind/fake-222/JONES-cloud-www
+++ b/bind/fake-222/JONES-cloud-www
@@ -5,6 +5,6 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-cloud
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud www
diff --git a/bind/fake-222/JONES-mailonly b/bind/fake-222/JONES-mailonly
index 32e5f01..3f9c7cf 100644
--- a/bind/fake-222/JONES-mailonly
+++ b/bind/fake-222/JONES-mailonly
@@ -4,4 +4,4 @@ $TTL 1w
  4h 1h 1w 1h )
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
diff --git a/bind/fake-222/JONES-nomail b/bind/fake-222/JONES-nomail
index 1b37fab..0d068de 100644
--- a/bind/fake-222/JONES-nomail
+++ b/bind/fake-222/JONES-nomail
@@ -5,6 +5,6 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME *
diff --git a/bind/fake-222/JONES-www b/bind/fake-222/JONES-www
index e880094..e7e4aed 100644
--- a/bind/fake-222/JONES-www
+++ b/bind/fake-222/JONES-www
@@ -5,6 +5,6 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/JONES-www+source b/bind/fake-222/JONES-www+source
index b6f8d8b..edff50d 100644
--- a/bind/fake-222/JONES-www+source
+++ b/bind/fake-222/JONES-www+source
@@ -5,7 +5,7 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/JONES-www+source+admin+media b/bind/fake-222/JONES-www+source+admin+media
index d5e44f7..b1f5c75 100644
--- a/bind/fake-222/JONES-www+source+admin+media
+++ b/bind/fake-222/JONES-www+source+admin+media
@@ -5,7 +5,7 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME admin
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
diff --git a/bind/fake-222/JONES-www+source+media b/bind/fake-222/JONES-www+source+media
index 11581fe..57419a7 100644
--- a/bind/fake-222/JONES-www+source+media
+++ b/bind/fake-222/JONES-www+source+media
@@ -5,7 +5,7 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME source
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/JONES-www-nomail b/bind/fake-222/JONES-www-nomail
index 46eee60..b86e01e 100644
--- a/bind/fake-222/JONES-www-nomail
+++ b/bind/fake-222/JONES-www-nomail
@@ -5,6 +5,6 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/OFF b/bind/fake-222/OFF
index 43914e4..2eb7875 100644
--- a/bind/fake-222/OFF
+++ b/bind/fake-222/OFF
@@ -4,4 +4,4 @@ $TTL 1w
  4h 1h 1w 1h )
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
- NS localhost.
+@ NS localhost.
diff --git a/bind/fake-222/TEENY-nomail b/bind/fake-222/TEENY-nomail
index f33dbd5..5f9b657 100644
--- a/bind/fake-222/TEENY-nomail
+++ b/bind/fake-222/TEENY-nomail
@@ -5,6 +5,6 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-teeny-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-teeny *
diff --git a/bind/fake-222/biks.dk b/bind/fake-222/biks.dk
index 0561b43..b5ebc71 100644
--- a/bind/fake-222/biks.dk
+++ b/bind/fake-222/biks.dk
@@ -5,7 +5,7 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/A-222
 $INCLUDE JONES.DK/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 
 $INCLUDE JONES.DK/skel/A-singed-222 singed
 $INCLUDE JONES.DK/skel/MX-avoid singed
diff --git a/bind/fake-222/bitbase.dk b/bind/fake-222/bitbase.dk
index eab084e..b153de4 100644
--- a/bind/fake-222/bitbase.dk
+++ b/bind/fake-222/bitbase.dk
@@ -4,7 +4,7 @@ $TTL 1h
  4h 1h 1w 1h )
 
 $INCLUDE JONES.DK/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 		A	80.68.88.141
 
 www		A	80.68.88.141
diff --git a/bind/fake-222/friis-holm.dk b/bind/fake-222/friis-holm.dk
index 168f482..d25d349 100644
--- a/bind/fake-222/friis-holm.dk
+++ b/bind/fake-222/friis-holm.dk
@@ -4,7 +4,7 @@ $TTL 1h
  4h 1h 1w 1h )
 
 $INCLUDE JONES.DK/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 
 $INCLUDE JONES.DK/skel/MX-avoid shop
 shop		A	185.31.76.101
diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 5ffba77..d53bb2b 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -10,7 +10,7 @@ $TTL 1w
 
 $INCLUDE JONES.DK/skel/A-222
 $INCLUDE JONES.DK/skel/MX
- NS localhost.
+@ NS localhost.
  NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp
  NAPTR 20 0 "s" "SIP+D2T" "" _sip._tcp
  NAPTR 30 0 "s" "SIP+D2U" "" _sip._udp
@@ -138,7 +138,7 @@ graograman A 192.168.222.2 ;A-fibia
 
 $INCLUDE JONES.DK/skel/MX-avoid koreander
 $INCLUDE JONES.DK/skel/LOC koreander
- A 192.168.222.247 ;A-fibia
+koreander A 192.168.222.247 ;A-fibia
  HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
@@ -190,7 +190,7 @@ xayide HINFO "Intel Celeron J4005 Dual @ 2.00GHz (ASUS PRIME J4005I-C fanless)"
 $INCLUDE JONES.DK/skel/MX-avoid slamuf
 $INCLUDE JONES.DK/skel/LOC slamuf
 slamuf A 192.168.222.251 ;188.183.5.254; via xayide.jones.dk
-slamuf HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
+ HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
  TXT "Desc=Storage server"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Unotel"
@@ -210,28 +210,28 @@ hydorn A 192.168.222.248 ;188.183.5.254
 ;$INCLUDE JONES.DK/skel/MX-avoid XXX
 ;$INCLUDE JONES.DK/skel/LOC XXX
 ;XXX A 192.168.222.248
-;XXX HINFO "VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
+; HINFO "VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
 : TXT "Desc=Storage server"
 : TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid hynreck
 $INCLUDE JONES.DK/skel/LOC hynreck
 hynreck A 192.168.222.249
-hynreck HINFO "Marvell Kirkwood @ 1.2GHz (SheevaPlug)" "Debian GNU/Linux"
+ HINFO "Marvell Kirkwood @ 1.2GHz (SheevaPlug)" "Debian GNU/Linux"
  TXT "Desc=Application server"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid hykrion
 $INCLUDE JONES.DK/skel/LOC hykrion
 hykrion A 192.168.222.254
-hykrion HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
+ HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Application server"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 
 ;$INCLUDE JONES.DK/skel/MX-avoid cairon
 ;$INCLUDE JONES.DK/skel/LOC cairon
 ;cairon A 192.168.222.253 ; 188.183.5.254 ; via xayide.jones.dk
-;cairon HINFO "Intel IXP420 B0 @ 266MHz (Linksys NSLU2)" "Debian GNU/Linux"
+; HINFO "Intel IXP420 B0 @ 266MHz (Linksys NSLU2)" "Debian GNU/Linux"
 ; TXT "Desc=Kerberos KDC"
 ; TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 ; TXT "ISP=TDC"
@@ -241,7 +241,7 @@ hykrion HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian G
 $INCLUDE JONES.DK/skel/MX-avoid perilin
 $INCLUDE JONES.DK/skel/LOC perilin
 perilin A 192.168.222.1 ;188.183.5.254; via xayide.jones.dk
-perilin HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
+ HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Unotel"
@@ -258,7 +258,7 @@ perilin HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
 
 $INCLUDE JONES.DK/skel/A-cloud morla
 $INCLUDE JONES.DK/skel/MX-avoid morla
- HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
+morla HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
  TXT "Desc=Server"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Scaleway"
@@ -442,40 +442,40 @@ backup CNAME slamuf
 
 $INCLUDE JONES.DK/skel/MX-avoid auryn
 auryn A 192.168.222.52
-auryn HINFO "Intel Core 2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
+ HINFO "Intel Core 2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "Debian GNU/Linux"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid auryn-old
 auryn-old A 192.168.222.53
-auryn-old HINFO "PowerPC 7410 (Apple albook)" "Debian GNU/Linux"
+ HINFO "PowerPC 7410 (Apple albook)" "Debian GNU/Linux"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid olav
 $INCLUDE JONES.DK/skel/LOC olav
 olav A 192.168.222.54
-olav HINFO "Intel T2060 @ 1.50GHz (HP Pavilion RR523AA-UUW s7721.sc)" "Debian GNU/Linux"
+ HINFO "Intel T2060 @ 1.50GHz (HP Pavilion RR523AA-UUW s7721.sc)" "Debian GNU/Linux"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid gmork
 gmork A 192.168.222.56
-gmork HINFO "Transmeta Crusoe TM5600 (Sony VAIO PCG-C1VE)" "Debian GNU/Linux"
+ HINFO "Transmeta Crusoe TM5600 (Sony VAIO PCG-C1VE)" "Debian GNU/Linux"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid atreju
 $INCLUDE JONES.DK/skel/LOC atreju
 atreju A 192.168.222.57
-atreju HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
+ HINFO "Intel Atom D525 @ 1.80GHz (ZOTAC NM10-ITX)" "Debian GNU/Linux"
  LOC 55 45 51.54 N 11 49 1.64 E 10m 10m
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid bastian
 bastian A 192.168.222.58
-bastian HINFO "AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
+ HINFO "AMD C-60 @ 1GHz (Acer Aspire One 725)" "Debian GNU/Linux"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/MX-avoid dharma
 dharma A 192.168.222.125
-dharma HINFO "Intel Core2 Duo P7450 @ 2.13GHz (Apple MacBook5,2)" "Debian GNU/Linux"
+ HINFO "Intel Core2 Duo P7450 @ 2.13GHz (Apple MacBook5,2)" "Debian GNU/Linux"
  TXT "Owner=Siri Reiter"
 
 trabant A 192.168.222.3
diff --git a/bind/fake-222/kassandra-production.dk b/bind/fake-222/kassandra-production.dk
index 81eaf87..a55f6fb 100644
--- a/bind/fake-222/kassandra-production.dk
+++ b/bind/fake-222/kassandra-production.dk
@@ -5,7 +5,7 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-222
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME omni
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME www
diff --git a/bind/fake-222/omni-presence.dk b/bind/fake-222/omni-presence.dk
index 28b07c1..613cf5f 100644
--- a/bind/fake-222/omni-presence.dk
+++ b/bind/fake-222/omni-presence.dk
@@ -5,7 +5,7 @@ $TTL 1w
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/A-cloud
 $INCLUDE /etc/local-JONES.DK/bind/skel/MX
- NS localhost.
+@ NS localhost.
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME form
 $INCLUDE /etc/local-JONES.DK/bind/skel/CNAME-cloud www
diff --git a/bind/fake-222/redpill.dk b/bind/fake-222/redpill.dk
index 9c99c07..5e1e1c2 100644
--- a/bind/fake-222/redpill.dk
+++ b/bind/fake-222/redpill.dk
@@ -4,7 +4,7 @@ $TTL 1h
  4h 1h 1w 1h )
 
 $INCLUDE JONES.DK/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 		A	80.68.88.141
 
 data		CNAME xayide.jones.dk.
diff --git a/bind/fake-222/superserver.dk b/bind/fake-222/superserver.dk
index a4e15ec..da6747a 100644
--- a/bind/fake-222/superserver.dk
+++ b/bind/fake-222/superserver.dk
@@ -4,7 +4,7 @@ $TTL 1h
  4h 1h 1w 1h )
 
 $INCLUDE JONES.DK/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 		A	80.68.88.141
 
 $INCLUDE JONES.DK/skel/MX-avoid ns
diff --git a/bind/fake-222/xpositionreverse.org b/bind/fake-222/xpositionreverse.org
index 5e47b22..3004e96 100644
--- a/bind/fake-222/xpositionreverse.org
+++ b/bind/fake-222/xpositionreverse.org
@@ -5,7 +5,7 @@ $TTL 1w
 
 $INCLUDE JONES.DK/skel/A-222
 $INCLUDE JONES.DK/skel/MX-avoid
- NS localhost.
+@ NS localhost.
 
 $INCLUDE JONES.DK/skel/A-222 www
 $INCLUDE JONES.DK/skel/MX-avoid www
diff --git a/bind/pri/bitbase.dk b/bind/pri/bitbase.dk
index 05c0375..1feeb85 100644
--- a/bind/pri/bitbase.dk
+++ b/bind/pri/bitbase.dk
@@ -5,7 +5,7 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/MX-avoid
-		A	80.68.88.141
+@		A	80.68.88.141
 www		A	80.68.88.141
 		MX 0	.
 		SPF	"v=spf1 -all"
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index b79b710..fecadfd 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -11,7 +11,7 @@ $TTL 1h
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/A
 $INCLUDE JONES.DK/skel/MX
- NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp
+@ NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp
  NAPTR 20 0 "s" "SIP+D2T" "" _sip._tcp
  NAPTR 30 0 "s" "SIP+D2U" "" _sip._udp
 _token._dnswl TXT "zry8v46apknycjk72b7r4iklbmvngqwf"
@@ -126,7 +126,7 @@ fsub1 A 193.26.120.115
 $INCLUDE JONES.DK/skel/A-fibia graograman
 $INCLUDE JONES.DK/skel/MX-avoid graograman
 $INCLUDE JONES.DK/skel/LOC graograman
- HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
+graograman HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
  SSHFP 1 1 6c22504ade5ad8ca8f03dd6eb7618ad38c09d578
@@ -139,7 +139,7 @@ $INCLUDE JONES.DK/skel/LOC graograman
 $INCLUDE JONES.DK/skel/A-fibia koreander
 $INCLUDE JONES.DK/skel/MX-avoid koreander
 $INCLUDE JONES.DK/skel/LOC koreander
- HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
+koreander HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
  SSHFP 1 1 070c7e186c360bde75212da95d16df61e236c64d
@@ -152,14 +152,14 @@ $INCLUDE JONES.DK/skel/LOC koreander
 $INCLUDE JONES.DK/skel/A-fibia singed
 $INCLUDE JONES.DK/skel/MX-avoid singed
 $INCLUDE JONES.DK/skel/LOC singed
- HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
+singed HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Server"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 
 $INCLUDE JONES.DK/skel/A-fibia teeny
 $INCLUDE JONES.DK/skel/MX-avoid teeny
 $INCLUDE JONES.DK/skel/LOC teeny
- HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
+teeny HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Server"
  TXT "Owner=Siri Reiter"
  SSHFP 1 1 599d62af504a29e5840f325d9072ac4d505e3929
@@ -197,7 +197,7 @@ slamuf HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
 
 $INCLUDE JONES.DK/skel/A hydorn
 $INCLUDE JONES.DK/skel/MX-avoid hydorn
- HINFO "AMD Dual Athlon 64 X2 @ 2.7GHz (ASUS M2N68-VM)" "Debian GNU/Linux"
+hydorn HINFO "AMD Dual Athlon 64 X2 @ 2.7GHz (ASUS M2N68-VM)" "Debian GNU/Linux"
  TXT "Desc=Processing server"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Unotel"
@@ -250,7 +250,7 @@ perilin HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
 
 $INCLUDE JONES.DK/skel/A-cloud morla
 $INCLUDE JONES.DK/skel/MX-avoid morla
- HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
+morla HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
  TXT "Desc=Server"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Scaleway"
diff --git a/bind/pri/oroe.dk b/bind/pri/oroe.dk
index dd76f83..1b94f04 100644
--- a/bind/pri/oroe.dk
+++ b/bind/pri/oroe.dk
@@ -4,7 +4,7 @@ $TTL 1h
  4h 1h 1w 1h )
 
 $INCLUDE /etc/local-JONES.DK/bind/skel/NS
- A 46.30.215.187
+@ A 46.30.215.187
  MX 10 oroe.dk.mx.one.com.
 
 _acme-challenge CNAME oroe.dk.acme.service.one.com.
diff --git a/bind/pri/redpill.dk b/bind/pri/redpill.dk
index 9b9fbd1..e7e4ff5 100644
--- a/bind/pri/redpill.dk
+++ b/bind/pri/redpill.dk
@@ -5,7 +5,7 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/MX-avoid
-		A	80.68.88.141
+@		A	80.68.88.141
 
 data		CNAME xayide.jones.dk.
 *.data		CNAME xayide.jones.dk.
diff --git a/bind/pri/superserver.dk b/bind/pri/superserver.dk
index b41b976..2313132 100644
--- a/bind/pri/superserver.dk
+++ b/bind/pri/superserver.dk
@@ -5,7 +5,7 @@ $TTL 1h
 
 $INCLUDE JONES.DK/skel/NS
 $INCLUDE JONES.DK/skel/MX-avoid
-		A	80.68.88.141
+@		A	80.68.88.141
 
 $INCLUDE JONES.DK/skel/MX-avoid ns
 ns		A	192.251.226.135