Sync fake view of jones.dk with pub view.

1 files changed, 83 insertions, 111 deletions

diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 765b95c..ed4517e 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -5,13 +5,16 @@ $TTL 1w
 
 ; Public zone roots, mailhubs and non-CNAME services (use A)
 
+$INCLUDE JONES.DK/skel/A-222
+$INCLUDE JONES.DK/skel/MX
  NS localhost.
-$INCLUDE /etc/local-JONES.DK/bind/skel/A-222
-$INCLUDE /etc/local-JONES.DK/bind/skel/MX
  NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp
  NAPTR 20 0 "s" "SIP+D2T" "" _sip._tcp
  NAPTR 30 0 "s" "SIP+D2U" "" _sip._udp
 
+$INCLUDE JONES.DK/skel/A-222 event
+$INCLUDE JONES.DK/skel/MX-avoid event
+
 $INCLUDE JONES.DK/skel/A-222 mail
 $INCLUDE JONES.DK/skel/MX-A mail
 
@@ -63,43 +66,6 @@ coreander A 80.68.88.141
  TXT "PTR=coreander.bitbase.dk"
  TXT "Addr=London"
 
-$INCLUDE JONES.DK/skel/MX-avoid cherry
-cherry A 193.106.165.64
- HINFO "Intel Pentium Dual E2180 @ 2.00GHz (Dell PowerEdge SC440)" "Debian GNU/Linux"
- TXT "Owner=Lab"
-; TXT "ISP=Tiscali"
-; TXT "Link=ADSL"
- TXT "PTR=cherry.107b.dk"
-; TXT "CNAME=213.237.80.158.adsl.vbr.worldonline.dk"
-; TXT "Addr=Vesterbro, Copenhagen"
-
-$INCLUDE JONES.DK/skel/MX-avoid db
-db A 95.142.165.142
- HINFO "Intel Xeon L5520 @ 2.27GHz (Xen)" "Debian GNU/Linux"
- TXT "Owner=Koebenhavns delebiler"
- TXT "ISP=gandi.net"
- TXT "Link=100mbit"
- TXT "PTR=xvm-165-142.ghst.net"
- TXT "Addr=Paris, France"
-
-$INCLUDE JONES.DK/skel/MX-avoid lb
-lb A 173.246.102.199
- HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
- TXT "Owner=Delebilfonden"
- TXT "ISP=gandi.net"
- TXT "Link=100mbit"
- TXT "PTR=xvm-102-199.ghst.net"
- TXT "Addr=Baltimore, USA"
-
-$INCLUDE JONES.DK/skel/MX-avoid dbold
-dbold A 77.243.52.40
- HINFO "AMD Opteron 2384 Quad @ 2.70GHz (VMware virtual Intel 440BX)" "Debian GNU/Linux"
- TXT "Owner=Koebenhavns delebiler"
- TXT "ISP=nianet"
- TXT "Link=100mbit"
- TXT "PTR=delebil01.hosted.netic.dk"
- TXT "Addr=Vesterbro, Copenhagen"
-
 $INCLUDE JONES.DK/skel/MX-avoid lxp5
 lxp5 A 217.197.91.142
  HINFO "Intel Atom Z510 @ 1.10GHz" "Debian GNU/Linux"
@@ -114,51 +80,17 @@ lxp5 A 217.197.91.142
 $INCLUDE JONES.DK/skel/MX-A xayide
 $INCLUDE JONES.DK/skel/LOC xayide
 xayide A 192.168.222.250 ;188.183.5.254
- HINFO "Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
- TYPE44 \# 22 01 01 ccd62a927603b0b166105c381c8b8e6ad2d9c4fa
- TYPE44 \# 22 02 01 e4f5fb784e2372e2ee7332506a59eb01066dc6c8
+xayide HINFO "Intel Atom 330 @ 1.60GHz (Intel D945GCLF2 fanless)" "Debian GNU/Linux"
  TXT "Desc=Application server"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Unotel"
  TXT "Link=ADSL"
  TXT "CNAME=0xbcb705fe.cpe.ge-0-2-0-1104.hknqu1.customer.tele.dk"
 
-$INCLUDE JONES.DK/skel/MX-avoid auryn
-auryn A 192.168.222.52
- HINFO "Intel Core2 Duo T5600 @ 1.83GHz (Apple MacBook2,1)" "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 auryn-old
-auryn-old A 192.168.222.53
- HINFO "PowerPC 7410 (Apple albook)" "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
- 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
-atreju A 192.168.222.57
- 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
- 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
- HINFO "Intel Core2 Duo P7450 @ 2.13GHz (Apple MacBook5,2)" "Debian GNU/Linux"
- TXT "Owner=Siri Reiter"
-
 $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
- HINFO "VIA Esther @ 1.00GHz (VIA EPIA VE5000 fanless)" "Debian GNU/Linux"
+slamuf 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=TDC"
@@ -167,50 +99,48 @@ slamuf A 192.168.222.251 ;188.183.5.254; via xayide.jones.dk
 
 $INCLUDE JONES.DK/skel/MX-avoid hydorn
 hydorn A 46.226.111.140
- HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
+hydorn HINFO "Intel Xeon L5640 @ 2.27GHz (Xen)" "Debian GNU/Linux"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=gandi.net"
  TXT "Link=100mbit"
  TXT "PTR=xvm-111-140.dc2.ghst.net"
  TXT "Addr=Bissen, Luxembourg"
 
-$INCLUDE JONES.DK/skel/MX-avoid XXX
-; A 192.168.222.248
-; HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
-: LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
+;$INCLUDE JONES.DK/skel/MX-avoid XXX
+;$INCLUDE JONES.DK/skel/LOC XXX
+;XXX A 192.168.222.248
+;XXX HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "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
- HINFO "Marvell Kirkwood @ 1.2GHz (SheevaPlug)" "Debian GNU/Linux"
- LOC 55 38 51.67 N 11 30 12.71 E 28m 2m
+hynreck 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 cairon
-cairon A 192.168.222.253 ; 188.183.5.254 ; via xayide.jones.dk
- HINFO "Intel IXP420 B0 @ 266MHz (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"
-
 $INCLUDE JONES.DK/skel/MX-avoid hykrion
 $INCLUDE JONES.DK/skel/LOC hykrion
 hykrion A 192.168.222.254
- HINFO "Allwinner Dual A20 @ 1GHz (OLimex OLinuXino LIME2)" "Debian GNU/Linux"
+hykrion HINFO "Allwinner Dual A20 @ 1GHz (OLimex 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"
+; 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"
+
 $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
- HINFO "VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
+perilin HINFO "VIA Samuel 2 @ 533MHz (EPIA CL6000E fanless)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
  TXT "ISP=Unotel"
@@ -228,13 +158,14 @@ morla A 163.172.142.110
  TXT "Addr=France"
 
 ; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME)
+*.event CNAME event
 *.lists CNAME lists
 
-$INCLUDE JONES.DK/skel/MX-avoid *.auryn
-*.auryn A 192.168.0.103
 
 ; Public CNAME-mapped PTR records
 
+188.183.5.254 PTR xayide
+
 ;; Public complex records
 ;kerberos CNAME cairon
 ;ldap CNAME xayide
@@ -247,22 +178,20 @@ $INCLUDE JONES.DK/skel/MX-avoid *.auryn
 ;_kerberos._udp SRV 0 0 88 cairon
 ; SRV 0 0 88 xayide
 ;_ldap._tcp SRV 0 0 389 xayide
-event CNAME xayide
-*.event CNAME xayide
-_caldavs._tcp.event SRV 0 0 443 xayide
+_caldavs._tcp.event SRV 0 0 443 event
 _jabber._tcp SRV 0 0 5269 xayide
 _xmpp-server._tcp SRV 0 0 5269 xayide
 _xmpp-client._tcp SRV 0 0 5222 xayide
-;_iax._udp SRV 0 0 4569 xayide
-_stun._udp SRV 5 0 3478 xayide
-_stun._tcp SRV 5 0 3478 xayide
-_stuns._tcp SRV 5 0 5349 xayide
-_turn._udp SRV 5 0 3478 xayide
-_turn._tcp SRV 5 0 3478 xayide
-_turns._tcp SRV 5 0 5349 xayide
-_sip._udp SRV 5 0 5060 xayide
-_sip._tcp SRV 5 0 5060 xayide
-_sips._tcp SRV 5 0 5061 xayide
+;_iax._udp SRV 0 0 4569 morla
+_stun._udp SRV 5 0 3478 morla
+_stun._tcp SRV 5 0 3478 morla
+_stuns._tcp SRV 5 0 5349 morla
+_turn._udp SRV 5 0 3478 morla
+_turn._tcp SRV 5 0 3478 morla
+_turns._tcp SRV 5 0 5349 morla
+_sip._udp SRV 5 0 5060 morla
+_sip._tcp SRV 5 0 5060 morla
+_sips._tcp SRV 5 0 5061 morla
 _xmppconnect TXT "_xmpp-client-xbosh=https://chat.jones.dk/http-bind"
 
 ; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner)
@@ -372,6 +301,7 @@ nande CNAME xayide ; "Desc=Nande"
 *.nande CNAME xayide
 foto CNAME xayide ; "Owner=Stine" "Desc=Nicaragua tur-retur"
 *.foto CNAME xayide
+phone CNAME morla
 photo CNAME xayide
 *.photo CNAME xayide
 visensvenner CNAME xayide
@@ -429,49 +359,91 @@ helloearth CNAME xayide
 *.helloearth CNAME xayide
 cyberhus CNAME xayide
 *.cyberhus CNAME xayide
-sip.db CNAME coreander
 wall CNAME xayide
 *.wall CNAME xayide
 
 ; Private zone roots, mailhubs and non-CNAME services (use A)
 
 ; Private hosts (use A)
+
+$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"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ TXT "Owner=Siri Reiter"
+
 airport A 192.168.222.2
  HINFO "AMD Elan SC400-33AC (Apple Airport Graphite)" "KarlBridge"
  TXT "Desc=WiFi router"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
+
 trabant A 192.168.222.3
  HINFO "Broadcom BCM5354 (LINKSYS WRT54G2 ver. ?)" "DD-WRT"
  TXT "Desc=WiFi router"
  TXT "Owner=Børneuniversitetet"
+
 buffalo A 192.168.222.4
  HINFO "RALink 3052 F (Buffalo WHR-G300N)" "DD-WRT"
  TXT "Desc=WiFi router"
  TXT "Owner=Kaospiloterne"
+
 groab A 192.168.222.11
  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
  HINFO "PowerPC (Apple PowerMac G4 Silver)" "Debian GNU/Linux"
  LOC 55 38 N 012 05 E 100m
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
+
 lp1 A 192.168.222.21
 lp2 A 192.168.222.22
 lp3 A 192.168.222.23
 grandstream A 192.168.222.31
 n80 A 192.168.222.32
+
 xo1 A 192.168.222.112
  HINFO "PowerPC G3 500MHz (Apple iMac FireWire)" "Debian GNU/Linux"
  LOC 55 38 N 012 05 E 100m
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
+
 hafferlaffen A 192.168.222.116
  HINFO "PowerPC G3 500MHz (Apple iMac FireWire)" "Debian GNU/Linux"
  LOC 55 38 N 012 05 E 100m
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
 
+
 ; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME)
+*.auryn A 192.168.0.103
+$INCLUDE JONES.DK/skel/MX-avoid *.auryn
 
 ; Private CNAME-mapped PTR records
 192.168.222.1 PTR perilin