distorted.lisp: Fix `eggle' nameserver entries.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c81e13bbba542b150f2459e97cd5b31fd8f2c6d0..739069267b6d091c31d5a1e4f9b74df5d80aa36d 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -28,9 +28,31 @@ (defzoneparse :anycast (name data rec :prefix prefix :zname zname)
     (dolist (provider (list* any-provider default-provider other-providers))
       (zone-set-address #'rec (cdr provider)
                        :make-ptr-p (eq provider any-provider)
     (dolist (provider (list* any-provider default-provider other-providers))
       (zone-set-address #'rec (cdr provider)
                        :make-ptr-p (eq provider any-provider)

-                       :name (concatenate 'string prefix "."
-                                          (string-downcase (car provider))
-                                          "." (string-downcase zname))))))
+                       :name (domain-name-concat prefix
+                                                 (zone-parse-host
+                                                  (car provider)
+                                                  zname))))))
+
+;;;--------------------------------------------------------------------------
+;;; Hostname abbreviations.
+
+(defvar *abbrev-subdomain*
+  (make-domain-name :labels '("abbrev") :absolutep nil))
+(defparameter *abbrev-used* (make-hash-table :test #'equal))
+
+(defzoneparse :abbrev (name data rec :zname zname)
+  (let* ((domain (zone-parse-host data
+                                 (domain-name-concat *abbrev-subdomain*
+                                                     zname)))
+        (key (princ-to-string domain))
+        (existing (gethash key *abbrev-used*)))
+    (when existing
+      (error "Abbrev collision for ~A between ~A and ~A."
+            domain existing name))
+    (setf (gethash key *abbrev-used*) name)
+    (rec :name domain
+        :type :cname
+        :data name)))

 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.
 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.


@@ -45,69 +67,58 @@ (setf *default-zone-source* 'radius.distorted.org.uk.)
 (defzone distorted.org.uk
 
   ;; Nameservers.
 (defzone distorted.org.uk
 
   ;; Nameservers.

-  :ns #+view/inside ((radius.ns :ip radius)
-                    (precision.ns :ip precision)
-                    (telecaster.ns :ip telecaster)
-                    (vampire.ns :ip vampire))
-      #-view/inside ((radius.ns :ip radius)
-                    (precision.ns :ip precision)
-                    (telecaster.ns :ip telecaster)
-                    (mythic-beasts-1.ns :ip mythic-ns1)
-                    (mythic-beasts-2.ns :ip mythic-ns2)
-                    (chiark.ns :ip chiark.greenend.org.uk))
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       (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)
+       #-view/inside (chiark.ns :ip chiark.greenend.org.uk))
+
+  ;; Certification.
+  :caa ((:issue "letsencrypt.org")
+       (:issue "distorted.org.uk"))

 
   ;; Mail servers.
 
   ;; Mail servers.

-  ((@ mail)
-   :mx mail
-   :srv ((:smtp mail)))
-  ((lists bugs cryptomail)
-   :ttl 300
-   :mx mail
-   :srv ((:smtp old-mail)))
-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email"))
+  ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
+  (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.
 
   ;; 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)))
                  (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)
 
   (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)
 
   (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")
   (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)
   (krb-master (unsafe :svc radius.unsafe)
              (dmz :svc radius.dmz))
   :srv (((:kerberos :protocol :udp)


@@ -122,106 +133,186 @@ (defzone distorted.org.uk
   :srv ((:http www)
        (:ftp ftp))
 
   :srv ((:http www)
        (:ftp ftp))
 

-  ;; Entry is via little router box.
-  (dmz :net dmz)
-  (guvnor (dmz :addr guvnor.dmz))
-  (nat (dmz :addr nat.dmz))
-
-  ;; Wireless gateway.
-  (wireless :net wireless)
-  (evolution (safe :addr evolution.safe))
-  (evolution :alias evo)
-
-  ;; Colocated services.
-  ((irc vox) (colo :svc jazz.colo :sshfp "jazz")
-            (jump :svc jazz.jump :sshfp "jazz"))
-  ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
-                 (jump :svc stratocaster.jump :sshfp "stratocaster"))
-  :svc #+view/inside stratocaster.colo
-       #-view/inside stratocaster.jump
-  (cabal :svc stratocaster.colo :sshfp "stratocaster")
-  ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
-           (jump :svc telecaster.jump :sshfp "telecaster"))
-  (dyndns :svc telecaster.jump :sshfp "telecaster")
+  ;; 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) (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.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#))
+  (mail :tlsa (:smtp
+              #+view/inside #1#
+              #-view/inside (:domain-issued-certificate
+                             :public-key :sha-256
+                             #p"smtps-stratocaster")))
+  ((bugs lists) :tlsa (:smtp
+                      #+view/inside #1#
+                      #-view/inside (:domain-issued-certificate
+                                     :public-key :sha-256
+                                     #p"smtps-telecaster")))
+  :svc #+view/inside stratocaster.unsafe
+       #-view/inside stratocaster.dmz
+  (cabal :svc stratocaster.dmz :sshfp "stratocaster")

 
   ;; Local services.
 
   ;; Local services.

-  ((rawk pifi) (unsafe :svc artist.unsafe)
-              (dmz :svc artist.dmz))
+  (rawk (unsafe :svc artist.unsafe) (dmz :svc artist.dmz))
+  (rawk :tlsa (:https (:service-certificate-constraint
+                      :public-key :sha-256
+                      #p"https-artist")))

   (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
          (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
   (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
          (unsafe :svc roadstar.unsafe :sshfp "roadstar"))

-  ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire")

 
   ;; Internal services.
 
   ;; Internal services.

-  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
+  ((news lpr) :svc roadstar.unsafe :sshfp "roadstar")

 
   ;; Anonymity services.
 
   ;; 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.
 
   ;; Fancy connectivity.

-  (iodine (jump :svc jazz.jump))
-
-  ;; Colocated hosts.
-  (colo :net colo)
-  (jump :net jump)
-  (gate (jump :addr gate.jump :sshfp "precision"))
-  (fender (colo :addr fender.colo :sshfp "fender")
-         (jump :addr fender.jump :sshfp "fender"))
-  (precision (colo :addr precision.colo :sshfp "precision")
-            (jump :addr precision.jump :sshfp "precision"))
-  (telecaster (colo :addr telecaster.colo :sshfp "telecaster")
-             (jump :addr telecaster.jump :sshfp "telecaster"))
-  (telecaster :alias tele)
-  (stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
-               (jump :addr stratocaster.jump :sshfp "stratocaster"))
-  (stratocaster :alias strat)
-  (jazz (colo :addr jazz.colo :sshfp "jazz")
-       (jump :addr jazz.jump :sshfp "jazz")
-       (iodine :addr jazz.iodine :sshfp "jazz"))
-
-  ;; Media server (on loan to Good Technology HSTG).
-  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
-
-  ;; Nicko's server.
-  (richmond (jump :svc richmond.jump))
+  (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
+             (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
+               (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))
+  (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 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 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 and scanner.
+  (burntaxe :alias lp0)
+  (burntaxe (safe :addr burntaxe.safe))
+  (unicorn :alias scan0)
+  (unicorn (safe :addr unicorn.safe))
+
+  ;; Switches.
+  (grigsby :alias tp0)
+  (grigsby (safe :addr grigsby.safe))
+  (carling :alias tp1)
+  (carling (safe :addr carling.safe))
+  (tritan :alias tp2)
+  (tritan (safe :addr tritan.safe))

 
   ;; Wired ethernet.
   (unsafe :net unsafe)
   (safe :net safe)
   (untrusted :net untrusted)
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
   (safe :net safe)
   (untrusted :net untrusted)

+  (vampire :abbrev v
+          (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv)
+          (safe :abbrev vs) (untrusted :abbrev vx))

   (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
           (dmz :addr vampire.dmz :sshfp "vampire")
   (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
           (dmz :addr vampire.dmz :sshfp "vampire")

+          (vpn :addr vampire.vpn :sshfp "vampire")

           (safe :addr vampire.safe :sshfp "vampire")
           (untrusted :addr vampire.untrusted :sshfp "vampire"))
           (safe :addr vampire.safe :sshfp "vampire")
           (untrusted :addr vampire.untrusted :sshfp "vampire"))

+  (ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id))

   (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
          (dmz :addr ibanez.dmz :sshfp "ibanez"))
   (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
          (dmz :addr ibanez.dmz :sshfp "ibanez"))

+  (radius :abbrev r
+         (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv)
+         (safe :abbrev rs) (untrusted :abbrev rx))

   (radius (unsafe :addr radius.unsafe :sshfp "radius")
          (dmz :addr radius.dmz :sshfp "radius")
   (radius (unsafe :addr radius.unsafe :sshfp "radius")
          (dmz :addr radius.dmz :sshfp "radius")

+         (vpn :addr radius.vpn :sshfp "radius")

          (safe :addr radius.safe :sshfp "radius")
          (untrusted :addr radius.untrusted :sshfp "radius"))
          (safe :addr radius.safe :sshfp "radius")
          (untrusted :addr radius.untrusted :sshfp "radius"))

+  (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))

   (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar")
            (dmz :addr roadstar.dmz :sshfp "roadstar"))
   (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar")
            (dmz :addr roadstar.dmz :sshfp "roadstar"))

+  (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))

   (jem (unsafe :addr jem.unsafe :sshfp "jem")
        (dmz :addr jem.dmz :sshfp "jem"))
   (jem (unsafe :addr jem.unsafe :sshfp "jem")
        (dmz :addr jem.dmz :sshfp "jem"))

+  (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud))
+  (universe (unsafe :addr universe.unsafe :sshfp "universe")
+           (dmz :addr universe.dmz :sshfp "universe"))
+  (artist :abbrev a
+         (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))

   (artist (unsafe :addr artist.unsafe :sshfp "artist")
          (dmz :addr artist.dmz :sshfp "artist")
          (untrusted :addr artist.untrusted :sshfp "artist"))
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
          (dmz :addr artist.dmz :sshfp "artist")
          (untrusted :addr artist.untrusted :sshfp "artist"))

+  (groove :abbrev gr
+         (vpn :abbrev grv) (unsafe :abbrev gru))
+  (groove (vpn :addr groove.vpn :sshfp "groove")
+         (unsafe :addr groove.unsafe :sshfp "groove"))

 
   ;; DHCP hosts.
 
   ;; DHCP hosts.

-  (gibson :cname gibson.dhcp)
+  (gibson :cname gibson.dhcp :abbrev g)

   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)

+  (gretsch :cname gretsch.dhcp)

 
   ;; Virtual network.
   (vpn :net vpn)
 
   ;; Virtual network.
   (vpn :net vpn)

-  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby"))
+  (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"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))

+  (orange :abbrev o)

   (orange (vpn :addr orange.vpn :sshfp "orange"))
   (orange (vpn :addr orange.vpn :sshfp "orange"))

+  (haze :abbrev h)
+  (haze (vpn :addr haze.vpn :sshfp "haze"))

   (iodine :net iodine)
   (iodine :net iodine)

+  (hippo :net hippo)

 
   ;; ITS.
   (its :net its)
 
   ;; ITS.
   (its :net its)


@@ -229,109 +320,212 @@ (defzone distorted.org.uk
   (mz (its :addr mz.its))
 
   ;; Strange things.
   (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)
             (precision.ns.dhcp :ip precision)
             (telecaster.ns.dhcp :ip telecaster)
 
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
             (precision.ns.dhcp :ip precision)
             (telecaster.ns.dhcp :ip telecaster)

-            (vampire.ns.dhcp :ip vampire)))
+            (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)
            (precision.ns.dyn :ip precision)
            (telecaster.ns.dyn :ip telecaster)
   (dyn :ns ((radius.ns.dyn :ip radius)
            (precision.ns.dyn :ip precision)
            (telecaster.ns.dyn :ip telecaster)

-           (vampire.ns.dyn :ip vampire)))
+           (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)
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)

-              (precision.ns.dnserr :ip precision.jump)
-              (telecaster.ns.dnserr :ip telecaster)
-              (vampire.ns.dnserr :ip vampire.dmz)))
-  (io :ns ((ns.io :ip jazz.jump))))
+              (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"))))
+  (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.stratocaster.dkim :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.telecaster.dkim :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.
 
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 

+#+view/outside

 (defzone dhcp.distorted.org.uk
 (defzone dhcp.distorted.org.uk

+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       (eggle.ns :ip eggle))

   (gibson :addr gibson.unsafe)
   (gibson :addr gibson.unsafe)

-  (lespaul :addr lespaul.safe)
+  (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))
 
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))
 

+#+view/outside
+(defzone (dyn.distorted.org.uk :source telecaster.distorted.org.uk.)
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)
+       (eggle.ns :ip eggle)))
+
+#+view/outside

 (defzone nicko.org
 (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 :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 :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.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
 
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.)

   :reverse unsafe
   :reverse vpn
   :reverse unsafe
   :reverse vpn

-  :reverse colo

   :reverse its
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
             precision.distorted.org.uk.
             telecaster.distorted.org.uk.
   :reverse its
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
             precision.distorted.org.uk.
             telecaster.distorted.org.uk.

-            vampire.distorted.org.uk.))
+            national.distorted.org.uk.))

   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 

-(defrevzone (dmz :family :ipv6)
+#+view/outside
+(defzone dhcp.199.29.172.in-addr.arpa

   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.distorted.org.uk.)
-  :reverse dmz)
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))

 
 

-(defrevzone (dmz :family :ipv4)
-  (144-159 :ns (radius.distorted.org.uk.
-               precision.distorted.org.uk.
-               telecaster.distorted.org.uk.
-               vampire.distorted.org.uk.))
-  :multi ((dmz :suffix "144-159") :cname *))
+(defrevzone untrusted
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))

 
 

-(defzone 144-159.204.49.62.in-addr.arpa
+(defzone 128-143.238.187.81.in-addr.arpa

   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.distorted.org.uk.)
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.
+       secondary-dns.co.uk.)

   :reverse ((((:ipv4 dmz)))))
 
   :reverse ((((:ipv4 dmz)))))
 

-(defrevzone (jump :family :ipv6)
+(defzone 64-79.12.169.217.in-addr.arpa

   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.distorted.org.uk.)
-  :reverse jump)
-
-(defrevzone (jump :family :ipv4)
-  (64-79 :ns (radius.distorted.org.uk.
-             precision.distorted.org.uk.
-             telecaster.distorted.org.uk.
-             vampire.distorted.org.uk.))
-  :multi ((jump :suffix "64-79") :cname *))
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.
+       secondary-dns.co.uk.)
+  :reverse ((((:ipv4 dmz1)))))

 
 

-(defzone 64-79.198.13.212.in-addr.arpa
+(defzone 195.113.2.81.in-addr.arpa

   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.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-he
+(defrevzone (distorted.org.uk-aaisp :family :ipv6)
+  :ns (radius.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.
+                               precision.distorted.org.uk.
+                               telecaster.distorted.org.uk.
+                               national.distorted.org.uk.
+                               eggle.distorted.org.uk.))
+  :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
+
+(defrevzone jump-ipv6

   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.distorted.org.uk.)
-  :reverse distorted.org.uk-he)
+       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.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.

-       vampire.distorted.org.uk.)
-  :reverse distorted.org.uk-jump)
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))

 
 

+#+view/outside

 (defzone io.distorted.org.uk
 (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 --------------------------------------------------
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))
 
 ;;;----- That's all, folks --------------------------------------------------