X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/b868d3f442cc210f04bc4f0cfa44de12d9c2f2ae..HEAD:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 59a3768..190c54e 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -71,7 +71,7 @@ (defzone distorted.org.uk
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+view/inside (vampire.ns :ip vampire)
+       (eggle.ns :ip eggle)
        #-view/inside (mythic-beasts-1.ns :ip mythic-ns1)
        #-view/inside (mythic-beasts-2.ns :ip mythic-ns2)
        #-view/inside (mythic-beasts-3.ns :ip mythic-ns3)
@@ -83,52 +83,42 @@ (defzone distorted.org.uk
 
   ;; Mail servers.
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
-  ((bugs) :ttl 300 :mx lists :srv ((:smtp bugs)))
-  ((lists) :ttl 300 :mx lists :srv ((:smtp lists)))
-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-	  :v "DKIM1" :k "rsa" :h "sha256" :s "email"))
+  (bugs :mx lists :srv ((:smtp bugs)))
+  (lists :mx lists :srv ((:smtp lists)))
+  (_dmarc :dmarc (:v "DMARC1"
+		  :p "quarantine" :sp "quarantine"
+		  :adkim "s" :aspf "s"))
+  ((_domainkey _domainkey.mail) :dname stratocaster.dkim)
+  ((stratocaster @ mail) :spf ((:version "spf1")
+			       (:pass :ip stratocaster.dmz)
+			       (:soft :all)))
+  ((_domainkey.bugs _domainkey.lists) :dname telecaster.dkim)
+  ((telecaster bugs lists) :spf ((:version "spf1")
+				 (:pass :ip telecaster.dmz)
+				 (:soft :all)))
 
   ;; Anycast services.
-  (dns0 :anycast ((any dns0.any)
-		  (jump precision.jump)
-		  (colo precision.colo)
-		  (dmz radius.dmz)
+  (dns0 :anycast ((any dns0.any) (dmz radius.dmz)
 		  (unsafe radius.unsafe)))
-  (dns1 :anycast ((any dns1.any)
-		  (jump telecaster.jump)
-		  (dmz vampire.dmz)
-		  (unsafe vampire.unsafe)
-		  (colo telecaster.colo)))
+  (dns1 :anycast ((any dns1.any) (dmz precision.dmz)
+		  (unsafe precision.unsafe)))
   (dns :cname dns0)
 
-  (ntp0 :anycast ((any ntp0.any)
-		  (jump fender.jump)
-		  (dmz ibanez.dmz)
-		  (unsafe ibanez.unsafe)
-		  (colo  fender.colo)))
-  (ntp1 :anycast ((any ntp1.any)
-		  (dmz vampire.dmz)
-		  (unsafe vampire.unsafe)))
+  (ntp0 :anycast ((any ntp0.any) (dmz ibanez.dmz)
+		  (unsafe ibanez.unsafe)))
+  (ntp1 :anycast ((any ntp1.any) (dmz fender.dmz)
+		  (unsafe fender.unsafe)))
   (ntp :cname ntp0)
 
-  (www-cache :anycast ((any www-cache.any)
-		       (jump telecaster.jump)
-		       (dmz roadstar.dmz)
-		       (unsafe roadstar.unsafe)
-		       (colo telecaster.colo)))
+  (www-cache :anycast ((any www-cache.any) (dmz telecaster.dmz)
+		       (unsafe telecaster.unsafe)))
   (wpad :cname www-cache)
 
   (_kerberos :txt "DISTORTED.ORG.UK")
-  (krb0 :anycast ((any krb0.any)
-		  (jump precision.jump)
-		  (dmz radius.dmz)
-		  (unsafe radius.unsafe)
-		  (colo precision.colo)))
-  (krb1 :anycast ((any krb1.any)
-		  (dmz vampire.dmz)
-		  (unsafe vampire.unsafe)))
+  (krb0 :anycast ((any krb0.any) (dmz radius.dmz)
+		  (unsafe radius.unsafe)))
+  (krb1 :anycast ((any krb1.any) (dmz precision.dmz)
+		  (unsafe precision.unsafe)))
   (krb-master (unsafe :svc radius.unsafe)
 	      (dmz :svc radius.dmz))
   :srv (((:kerberos :protocol :udp)
@@ -143,25 +133,25 @@ (defzone distorted.org.uk
   :srv ((:http www)
 	(:ftp ftp))
 
-  ;; Colocated services.
-  ((irc vox keys wiki) (colo :svc jazz.colo :sshfp "jazz")
-		       (jump :svc jazz.jump :sshfp "jazz"))
+  ;; Formerly colocated services.
+  ((irc vox keys wiki) (unsafe :svc jazz.unsafe :sshfp "jazz")
+		       (dmz :svc jazz.dmz :sshfp "jazz"))
   ((irc vox keys wiki) :tlsa (:https (:service-certificate-constraint
 				      :public-key :sha-256 #p"https-jazz")))
-  ((bugs lists db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
-		       (jump :svc telecaster.jump :sshfp "telecaster"))
+  ((bugs lists db ftp) (unsafe :svc telecaster.unsafe :sshfp "telecaster")
+		       (dmz :svc telecaster.dmz :sshfp "telecaster"))
   ((bugs lists ftp) :tlsa (:https #3=(:service-certificate-constraint
 				      :public-key :sha-256
 				      #p"https-telecaster")))
-  (dyndns :svc telecaster.jump :sshfp "telecaster")
-  ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
-		  (jump :svc stratocaster.jump :sshfp "stratocaster"))
+  (dyndns :svc telecaster.dmz :sshfp "telecaster")
+  ((git www mail) (unsafe :svc stratocaster.unsafe :sshfp "stratocaster")
+		  (dmz :svc stratocaster.dmz :sshfp "stratocaster"))
   ((www git mail @) :tlsa (:https #2=(:service-certificate-constraint
 				      :public-key :sha-256
 				      #p"https-stratocaster")))
   (www-cache :tlsa (3127 #1=(:trust-anchor-assertion
 			     :certificate :sha-256 #p"distorted-ca")))
-  (mail :tlsa ((:submission :imap :imaps) #1# #3#))
+  (mail :tlsa ((:submission :imap :imaps) #1#))
   (mail :tlsa (:smtp
 	       #+view/inside #1#
 	       #-view/inside (:domain-issued-certificate
@@ -172,9 +162,9 @@ (defzone distorted.org.uk
 		       #-view/inside (:domain-issued-certificate
 				      :public-key :sha-256
 				      #p"smtps-telecaster")))
-  :svc #+view/inside stratocaster.colo
-       #-view/inside stratocaster.jump
-  (cabal :svc stratocaster.colo :sshfp "stratocaster")
+  :svc #+view/inside stratocaster.unsafe
+       #-view/inside stratocaster.dmz
+  (cabal :svc stratocaster.dmz :sshfp "stratocaster")
 
   ;; Local services.
   (rawk (unsafe :svc artist.unsafe) (dmz :svc artist.dmz))
@@ -185,67 +175,69 @@ (defzone distorted.org.uk
 	  (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
   ;; Internal services.
-  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
+  ((news lpr) :svc roadstar.unsafe :sshfp "roadstar")
 
   ;; Anonymity services.
-  (anon (colo :svc jazz.colo)
-	(unsafe :svc vampire.unsafe)
-	(jump :addr anon.jump)
-	(dmz :addr anon.dmz))
+  (anon (dmz :svc anon.dmz)
+	(unsafe :svc jazz.unsafe))
 
   ;; Fancy connectivity.
-  (iodine (jump :svc jazz.jump))
-  (hippotat (jump :svc jazz.jump))
-
-  ;; Colocated hosts.
-  (colo :net colo)
-  (jump :net jump)
-  (gate (jump :addr gate.jump :sshfp "precision"))
-  (fender :abbrev f (colo :abbrev fc) (jump :abbrev fj))
-  (fender (colo :addr fender.colo :sshfp "fender")
-	  (jump :addr fender.jump :sshfp "fender"))
-  (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj) (vpn :abbrev pv))
-  (precision (colo :addr precision.colo :sshfp "precision")
-	     (jump :addr precision.jump :sshfp "precision")
+  (iodine (dmz :svc jazz.dmz))
+  (hippotat (dmz :svc jazz.dmz))
+
+  ;; Formerly colocated hosts.
+  (fender :abbrev f (unsafe :abbrev fu) (dmz :abbrev fd))
+  (fender (unsafe :addr fender.unsafe :sshfp "fender")
+	  (dmz :addr fender.dmz :sshfp "fender"))
+  (precision :abbrev p (unsafe :abbrev pu) (dmz :abbrev pd) (vpn :abbrev pv))
+  (precision (unsafe :addr precision.unsafe :sshfp "precision")
+	     (dmz :addr precision.dmz :sshfp "precision")
 	     (vpn :addr precision.vpn :sshfp "precision"))
   (telecaster :alias tele :abbrev t
-	      (colo :alias tele.colo :abbrev tc)
-	      (jump :alias tele.jump :abbrev tj))
-  (telecaster (colo :addr telecaster.colo :sshfp "telecaster")
-	      (jump :addr telecaster.jump :sshfp "telecaster"))
+	      (unsafe :alias tele.unsafe :abbrev tu)
+	      (dmz :alias tele.dmz :abbrev td))
+  (telecaster (unsafe :addr telecaster.unsafe :sshfp "telecaster")
+	      (dmz :addr telecaster.dmz :sshfp "telecaster"))
   (stratocaster :alias strat :abbrev s
-		(colo :alias strat.colo :abbrev sc)
-		(jump :alias strat.jump :abbrev sj))
-  (stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
-		(jump :addr stratocaster.jump :sshfp "stratocaster"))
-  (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj) (vpn :abbrev :zv))
-  (jazz (colo :addr jazz.colo :sshfp "jazz")
-	(jump :addr jazz.jump :sshfp "jazz")
+		(unsafe :alias strat.unsafe :abbrev su)
+		(dmz :alias strat.dmz :abbrev sd))
+  (stratocaster (unsafe :addr stratocaster.unsafe :sshfp "stratocaster")
+		(dmz :addr stratocaster.dmz :sshfp "stratocaster"))
+  (jazz :abbrev z (unsafe :abbrev zu) (dmz :abbrev zd) (vpn :abbrev :zv))
+  (jazz (unsafe :addr jazz.unsafe :sshfp "jazz")
+	(dmz :addr jazz.dmz :sshfp "jazz")
 	(vpn :addr jazz.vpn :sshfp "jazz")
 	(iodine :addr jazz.iodine :sshfp "jazz")
 	(hippo :addr jazz.hippo :sshfp "jazz"))
 
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
-  (national (linode :addr national.linode)
-	    (upn :addr national.upn))
-
-  ;; Media server (on loan to Good Technology HSTG).
-  (jaguar :abbrev jag)
-  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
+  (national (linode :addr national.linode) (upn :addr national.upn))
+  (eggle :abbrev e (jump :abbrev ej) (upn :abbrev ey))
+  (eggle (jump :addr eggle.jump) (upn :addr eggle.upn))
+  (mdwdev (upn :addr mdwdev.upn))
 
-  ;; Nicko's server.
-  (richmond (jump :svc richmond.jump))
+  ;; Nicko's servers.
+  (richmond (dmz :svc richmond.dmz))
+  (marshall (dmz :svc marshall.dmz))
 
   ;; Entry is via little router box.
   (dmz :net dmz)
   (guvnor (dmz :addr guvnor.dmz))
   (nat (dmz :addr nat.dmz))
 
-  ;; Wireless gateway.
+  ;; Wireless access points.
   (wireless :net wireless)
   (evolution (safe :addr evolution.safe))
   (evolution :alias evo)
+  (kitkat :alias ap0)
+  (kitkat (safe :addr kitkat.safe))
+  (lunch :alias ap1)
+  (lunch (safe :addr lunch.safe))
+
+  ;; Printer.
+  (burntaxe :alias lp0)
+  (burntaxe (safe :addr burntaxe.safe))
 
   ;; Switches.
   (grigsby :alias tp0)
@@ -292,8 +284,10 @@ (defzone distorted.org.uk
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
 	  (dmz :addr artist.dmz :sshfp "artist")
 	  (untrusted :addr artist.untrusted :sshfp "artist"))
-  (groove :abbrev gr)
-  (groove (unsafe :addr groove.unsafe :sshfp "groove"))
+  (groove :abbrev gr
+	  (vpn :abbrev grv) (unsafe :abbrev gru))
+  (groove (vpn :addr groove.vpn :sshfp "groove")
+	  (unsafe :addr groove.unsafe :sshfp "groove"))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp :abbrev g)
@@ -308,6 +302,8 @@ (defzone distorted.org.uk
   (crybaby :abbrev cb)
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
 	   (hippo :addr crybaby.hippo :sshfp "crybaby"))
+  (spirit (vpn :addr spirit.vpn :sshfp "spirit")
+	  (hippo :addr spirit.hippo :sshfp "spirit"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
@@ -322,173 +318,212 @@ (defzone distorted.org.uk
   (mz (its :addr mz.its))
 
   ;; Strange things.
-  (blackhole (jump :addr blackhole.jump))
+  (blackhole (dmz :addr blackhole.dmz))
 
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
-	     (vampire.ns.dhcp :ip vampire)
 	     (precision.ns.dhcp :ip precision)
 	     (telecaster.ns.dhcp :ip telecaster)
-	     (national.ns.dhcp :ip national))
+	     (national.ns.dhcp :ip national)
+	     (eggle.ns.dhcp :ip eggle))
 	:ds ((55966 :rsasha256 :sha1
 	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
 	     (55966 :rsasha256 :sha256
 	      #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
 				     "2e8440ec671371b35d8d978cd9ca3007"))))
   (dyn :ns ((radius.ns.dyn :ip radius)
-	    (vampire.ns.dyn :ip vampire)
 	    (precision.ns.dyn :ip precision)
 	    (telecaster.ns.dyn :ip telecaster)
-	    (national.ns.dyn :ip national))
+	    (national.ns.dyn :ip national)
+	    (eggle.ns.dyn :ip eggle))
        :ds ((11335 :rsasha256 :sha1
 	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
 	    (11335 :rsasha256 :sha256
 	     #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
 				    "0a41cf040d3d0f15a44dffd6476b2b55"))))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
-	       (vampire.ns.dnserr :ip vampire.dmz)
-	       (precision.ns.dnserr :ip precision.jump)
-	       (telecaster.ns.dnserr :ip telecaster.jump)
-	       (national.ns.dnserr :ip national.linode))
+	       (precision.ns.dnserr :ip precision.dmz)
+	       (telecaster.ns.dnserr :ip telecaster.dmz)
+	       (national.ns.dnserr :ip national.linode)
+	       (eggle.ns.dnserr :ip eggle.jump))
 	  :ds ((40945 :rsasha256 :sha1
 		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
 	       (40945 :rsasha256 :sha256
 		#.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
 				       "44f1db7f41e2260f1fe8d7c55d524c11"))))
-  (io :ns ((ns.io :ip jazz.jump))))
+  (stratocaster.dkim
+   :ns ((radius.ns.stratocaster.dkim :ip radius.dmz)
+	(precision.ns.stratocaster.dkim :ip precision.dmz)
+	(telecaster.ns.stratocaster.dkim :ip telecaster.dmz)
+	(national.ns.stratocaster.dkim :ip national.linode)
+	(eggle.ns :ip eggle.jump)
+	(mythic-beasts-1.ns.stratocaster.dkim :ip mythic-ns1)
+	(mythic-beasts-2.ns.stratocaster.dkim :ip mythic-ns2)
+	(mythic-beasts-3.ns.stratocaster.dkim :ip mythic-ns3))
+   :ds ((24577 :rsasha256 :sha1
+	 "d06847c01e19098509a8d07a9aafaceff532c9c7")
+	(24577 :rsasha256 :sha256
+	 #.(concatenate 'string "a40cdb1c633041cfbc1b80a400cff527"
+				"2cad051915fc0cd40296a2d4590b9d2b"))))
+  (telecaster.dkim
+   :ns ((radius.ns.telecaster.dkim :ip radius.dmz)
+	(precision.ns.telecaster.dkim :ip precision.dmz)
+	(telecaster.ns.telecaster.dkim :ip telecaster.dmz)
+	(national.ns.telecaster.dkim :ip national.linode)
+	(eggle.ns :ip eggle.jump)
+	(mythic-beasts-1.ns.telecaster.dkim :ip mythic-ns1)
+	(mythic-beasts-2.ns.telecaster.dkim :ip mythic-ns2)
+	(mythic-beasts-3.ns.telecaster.dkim :ip mythic-ns3))
+   :ds ((38896 :rsasha256 :sha1
+	 "2c2daea658784e22c46bf9e86da67def1e34cf40")
+	(38896 :rsasha256 :sha256
+	 #.(concatenate 'string "66997571c7d47f912caa65f2154ecd37"
+				"5b9d391e3ed44d79ac35eef59264e521"))))
+  (io :ns ((ns.io :ip jazz.dmz)))
+  (play :ns (radius.ns precision.ns telecaster.ns national.ns eggle.jump)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
+#+view/outside
 (defzone dhcp.distorted.org.uk
-  :ns ((radius.ns :ip radius.dmz)
-       (vampire.ns :ip vampire.dmz)
-       (precision.ns :ip precision.jump)
-       (telecaster.ns :ip telecaster.jump)
-       (national.ns :ip national.linode))
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       (eggle.ns.dhcp :ip eggle))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
   (gretsch :addr gretsch.unsafe)
+  (spirit :addr spirit.unsafe)
   (haze :addr haze.unsafe)
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))
 
-(defzone dyn.distorted.org.uk
+#+view/outside
+(defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
   :ns ((radius.ns :ip radius)
-       (vampire.ns :ip vampire)
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
-       (national.ns :ip national)))
+       (national.ns :ip national)
+       (eggle.ns.dhcp :ip eggle)))
 
+#+view/outside
 (defzone nicko.org
-  (richmond :addr richmond.jump))
+  (richmond :addr richmond.dmz))
+
+#+view/outside
+(defzone stratocaster.dkim.distorted.org.uk
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       (eggle.ns.dhcp :ip eggle)
+       (mythic-beasts-1.ns :ip mythic-ns1)
+       (mythic-beasts-2.ns :ip mythic-ns2)
+       (mythic-beasts-3.ns :ip mythic-ns3)))
+#+view/outside
+(defzone telecaster.dkim.distorted.org.uk
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       (eggle.ns.dhcp :ip eggle)
+       (mythic-beasts-1.ns :ip mythic-ns1)
+       (mythic-beasts-2.ns :ip mythic-ns2)
+       (mythic-beasts-3.ns :ip mythic-ns3)))
 
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.)
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
-  :reverse colo
   :reverse its
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
-	     vampire.distorted.org.uk.
 	     precision.distorted.org.uk.
 	     telecaster.distorted.org.uk.
 	     national.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
+#+view/outside
 (defzone dhcp.199.29.172.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.))
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))
 
 (defrevzone untrusted
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.))
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))
 
 (defzone 128-143.238.187.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 dmz)))))
 
-(defzone 195.113.2.81.in-addr.arpa
+(defzone 64-79.12.169.217.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
-  :reverse ((((:ipv4 gw)))))
+  :reverse ((((:ipv4 dmz1)))))
 
-(defrevzone (jump :family :ipv6)
-  :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
-       precision.distorted.org.uk.
-       telecaster.distorted.org.uk.
-       national.distorted.org.uk.)
-  :reverse jump)
-
-(defrevzone (jump :family :ipv4)
-  (64-79 :ns (radius.distorted.org.uk.
-	      vampire.distorted.org.uk.
-	      precision.distorted.org.uk.
-	      telecaster.distorted.org.uk.
-	      national.distorted.org.uk.))
-  :multi ((jump :suffix "64-79") :cname *))
-
-(defzone 64-79.198.13.212.in-addr.arpa
+(defzone 195.113.2.81.in-addr.arpa
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.)
-  :reverse ((((:ipv4 jump)))))
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.
+       secondary-dns.co.uk.)
+  :reverse ((((:ipv4 gw)))))
 
 (defrevzone (distorted.org.uk-aaisp :family :ipv6)
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.distorted.org.uk.
+       eggle.distorted.org.uk.
        secondary-dns.co.uk.)
   (0.7.3.6.8.6.4.6.1.0.0.0 :ns (radius.distorted.org.uk.
-				vampire.distorted.org.uk.
 				precision.distorted.org.uk.
 				telecaster.distorted.org.uk.
-				national.distorted.org.uk.))
+				national.distorted.org.uk.
+				eggle.distorted.org.uk.))
   :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 
-(defrevzone (dhcp :family :ipv6)
+(defrevzone jump-ipv6
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.))
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.)
+  :reverse ((((:ipv6 jump-ipv6)))))
 
-(defrevzone distorted.org.uk-jump
+(defrevzone (dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
-       national.distorted.org.uk.)
-  :reverse distorted.org.uk-jump)
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))
 
+#+view/outside
 (defzone io.distorted.org.uk
-  :ns ((ns :ip jazz.jump))
+  :ns ((ns :ip jazz.dmz))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))
 
 ;;;----- That's all, folks --------------------------------------------------