hosts.lisp: Fix IPv6 network address for Jump.

diff --git a/Makefile b/Makefile
index 7afee8a..9199918 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,22 +62,18 @@ ZONESETS             =
 ZONESETS               += distorted
 
 distorted_VIEWS                 = inside outside
-distorted_outside_NETS  = dmz jump
-distorted_inside_NETS   = any unsafe colo vpn nvpn upn nupn
+distorted_outside_NETS  = dmz
+distorted_inside_NETS   = any unsafe vpn upn
 
 distorted_all_ZONES    += distorted.org.uk
 
 distorted_all_ZONES    += 195.113.2.81.in-addr.arpa
 distorted_all_ZONES    += 128-143.238.187.81.in-addr.arpa
 distorted_all_ZONES    += 64-79.12.169.217.in-addr.arpa
-distorted_all_ZONES    += 64-79.198.13.212.in-addr.arpa
+distorted_all_ZONES    += 2.9.c.0.0.b.8.0.1.0.0.2.ip6.arpa
 
 distorted_all_ZONES    += 199.29.172.in-addr.arpa
 
-distorted_all_ZONES    += 9.d.1.0.0.0.0.0.8.a.b.0.1.0.0.2.ip6.arpa
-distorted_all_ZONES    += 2.9.c.0.0.b.8.0.1.0.0.2.ip6.arpa
-distorted_all_ZONES    += 9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa
-
 distorted_outside_NSDIFF = -sradius.dmz.distorted.org.uk
 
 ###--------------------------------------------------------------------------
@@ -104,6 +100,7 @@ odin_all_ZONES               = odin.gg
 
 ZONE                    = zone
 V_ZONE                  = $(call v_tag,ZONE)$(ZONE)
+ZONEOPTS                =
 
 .SECONDEXPANSION: #sorry
 
@@ -115,7 +112,7 @@ $(ALL_ZONESTAMPS) : %.zonestamp : $$(notdir $$*).lisp hosts.lisp
        $(V_AT)mkdir -p $(dir $*)
        $(V_ZONE) -d$(dir $*) -fview/$(call dir-nosl,$*)$(hack \
                hack) $(addprefix -s, \
-               $($(notdir $*)_$(call dir-nosl,$*)_NETS)) $<
+               $($(notdir $*)_$(call dir-nosl,$*)_NETS)) $(ZONEOPTS) $<
        $(V_AT)touch $@
 all: $(ALL_ZONESTAMPS)
 CLEANFILES += $(sort $(foreach s,$(ZONESETS), \

diff --git a/binswood.lisp b/binswood.lisp
index 322929d..b94a430 100644 (file)
--- a/binswood.lisp
+++ b/binswood.lisp
@@ -34,15 +34,13 @@
 
   ;; Dynamic addresses.
   (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)))
   (ext :cname ext.dyn))
 
-(defzone dyn.binswood.org.uk
+(defzone (dyn.binswood.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)))

diff --git a/distorted.lisp b/distorted.lisp
index d77925e..cac864b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -71,7 +71,6 @@
        (precision.ns :ip precision)
        (telecaster.ns :ip telecaster)
        (national.ns :ip national)
-       #+view/inside (vampire.ns :ip vampire)
        #-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 +82,42 @@
 
   ;; 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)
-                 (nany dns0.nany)
-                 (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)
-                 (nany dns1.nany)
-                 (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)
-                 (nany ntp0.nany)
-                 (dmz ibanez.dmz)
-                 (unsafe ibanez.unsafe)
-                 (colo  fender.colo)))
-  (ntp1 :anycast ((any ntp1.any) (dmz vampire.dmz)
-                 (nany ntp1.nany)
-                 (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)
-                      (nany www-cache.nany)
-                      (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)
-                 (nany krb0.nany)
-                 (dmz radius.dmz)
-                 (unsafe radius.unsafe)
-                 (colo precision.colo)))
-  (krb1 :anycast ((any krb1.any) (dmz vampire.dmz)
-                 (nany krb1.nany)
-                 (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,19 +132,19 @@
   :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")))
@@ -172,9 +161,9 @@
                       #-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,84 +174,51 @@
          (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
   ;; Internal services.
-  #+view/inside ((news lpr) :svc roadstar.unsafe :sshfp "roadstar")
+  ((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) (nvpn :abbrev pnv))
-  (precision (colo :addr precision.colo :sshfp "precision")
-            (jump :addr precision.jump :sshfp "precision")
-            (vpn :addr precision.vpn :sshfp "precision")
-            (nvpn :addr precision.nvpn :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) (nvpn :abbrev :znv))
-  (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")
-       (nvpn :addr jazz.nvpn :sshfp "jazz")
        (iodine :addr jazz.iodine :sshfp "jazz")
        (hippo :addr jazz.hippo :sshfp "jazz"))
 
-  ;; Formerly colocated hosts.
-  (nfender :abbrev nf (unsafe :abbrev fu) (dmz :abbrev fd))
-  (nfender (unsafe :addr fender.unsafe :sshfp "fender")
-          (dmz :addr fender.dmz :sshfp "fender"))
-  (nprecision :abbrev np (unsafe :abbrev pu) (dmz :abbrev pd))
-  (nprecision (unsafe :addr precision.unsafe :sshfp "precision")
-            (dmz :addr precision.dmz :sshfp "precision"))
-  (ntelecaster :alias ntele :abbrev nt
-             (unsafe :alias tele.unsafe :abbrev tu)
-             (dmz :alias tele.dmz :abbrev td))
-  (ntelecaster (unsafe :addr telecaster.unsafe :sshfp "telecaster")
-              (dmz :addr telecaster.dmz :sshfp "telecaster"))
-  (nstratocaster :alias nstrat :abbrev ns
-                (unsafe :alias strat.unsafe :abbrev su)
-                (dmz :alias strat.dmz :abbrev sd))
-  (nstratocaster (unsafe :addr stratocaster.unsafe :sshfp "stratocaster")
-                (dmz :addr stratocaster.dmz :sshfp "stratocaster"))
-  (njazz :abbrev nz (unsafe :abbrev zu) (dmz :abbrev zd))
-  (njazz (unsafe :addr jazz.unsafe :sshfp "jazz")
-        (dmz :addr jazz.dmz :sshfp "jazz"))
-
   ;; Virtual hosts.
-  (national :abbrev n (linode :abbrev nl) (upn :abbrev ny) (nupn :abbrev nny))
-  (national (linode :addr national.linode)
-           (upn :addr national.upn)
-           (nupn :addr national.nupn))
-  (mdwdev (upn :addr mdwdev.upn)
-         (nupn :addr mdwdev.nupn))
+  (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 (jump :svc richmond.jump))
-  (marshall (jump :svc marshall.jump))
+  (richmond (dmz :svc richmond.dmz))
+  (marshall (dmz :svc marshall.dmz))
 
   ;; Entry is via little router box.
   (dmz :net dmz)
@@ -295,26 +251,22 @@
   (safe :net safe)
   (untrusted :net untrusted)
   (vampire :abbrev v
-          (unsafe :abbrev vu) (dmz :abbrev vd)
-          (vpn :abbrev vv) (nvpn :abbrev vnv)
+          (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")
           (vpn :addr vampire.vpn :sshfp "vampire")
-          (nvpn :addr vampire.nvpn :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"))
   (radius :abbrev r
-         (unsafe :abbrev ru) (dmz :abbrev rd)
-         (vpn :abbrev rv) (nvpn :abbrev rnv)
+         (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")
          (vpn :addr radius.vpn :sshfp "radius")
-         (nvpn :addr radius.nvpn :sshfp "radius")
          (safe :addr radius.safe :sshfp "radius")
          (untrusted :addr radius.untrusted :sshfp "radius"))
   (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))
@@ -332,9 +284,8 @@
          (dmz :addr artist.dmz :sshfp "artist")
          (untrusted :addr artist.untrusted :sshfp "artist"))
   (groove :abbrev gr
-         (vpn :abbrev grv) (nvpn :abbrev ngrv) (unsafe :abbrev gru))
+         (vpn :abbrev grv) (unsafe :abbrev gru))
   (groove (vpn :addr groove.vpn :sshfp "groove")
-         (nvpn :addr groove.nvpn :sshfp "groove")
          (unsafe :addr groove.unsafe :sshfp "groove"))
 
   ;; DHCP hosts.
@@ -346,21 +297,17 @@
   (gretsch :cname gretsch.dhcp)
 
   ;; Virtual network.
-  (vpn :net vpn) (nvpn :net nvpn)
+  (vpn :net vpn)
   (crybaby :abbrev cb)
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
-          (nvpn :addr crybaby.nvpn :sshfp "crybaby")
           (hippo :addr crybaby.hippo :sshfp "crybaby"))
   (spirit (vpn :addr spirit.vpn :sshfp "spirit")
-         (nvpn :addr spirit.nvpn :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")
-         (nvpn :addr orange.nvpn :sshfp "orange"))
+  (orange (vpn :addr orange.vpn :sshfp "orange"))
   (haze :abbrev h)
-  (haze (vpn :addr haze.vpn :sshfp "haze")
-       (nvpn :addr haze.nvpn :sshfp "haze"))
+  (haze (vpn :addr haze.vpn :sshfp "haze"))
   (iodine :net iodine)
   (hippo :net hippo)
 
@@ -370,12 +317,10 @@
   (mz (its :addr mz.its))
 
   ;; Strange things.
-  (blackhole (dmz :addr blackhole.dmz)
-            (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))
@@ -385,7 +330,6 @@
              #.(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))
@@ -395,26 +339,52 @@
             #.(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)
+              (precision.ns.dnserr :ip precision.dmz)
+              (telecaster.ns.dnserr :ip telecaster.dmz)
               (national.ns.dnserr :ip national.linode))
          :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)
+       (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)
+       (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)))
 
 ;;;--------------------------------------------------------------------------
 ;;; 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))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
@@ -424,51 +394,66 @@
   (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)))
 
+#+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)
+       (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)
+       (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.)
   :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.))
 
 (defrevzone untrusted
   :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.
        national.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.
@@ -477,7 +462,6 @@
 
 (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.
@@ -486,46 +470,19 @@
 
 (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.
        secondary-dns.co.uk.)
   :reverse ((((:ipv4 gw)))))
 
-(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
-  :ns (radius.distorted.org.uk.
-       vampire.distorted.org.uk.
-       precision.distorted.org.uk.
-       telecaster.distorted.org.uk.
-       national.distorted.org.uk.)
-  :reverse ((((:ipv4 jump)))))
-
 (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.
        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.))
@@ -533,21 +490,13 @@
 
 (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.))
 
-(defrevzone distorted.org.uk-jump
-  :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)
-
+#+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 --------------------------------------------------

diff --git a/escorted.lisp b/escorted.lisp
index e2f542d..746dcb2 100644 (file)
--- a/escorted.lisp
+++ b/escorted.lisp
@@ -27,7 +27,10 @@
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email")))
+  :spf ((:version "spf1")
+       (:pass :ip stratocaster.dmz)
+       (:soft :all))
+  (_dmarc :dmarc (:v "DMARC1"
+                 :p "quarantine" :sp "quarantine"
+                 :adkim "s" :aspf "s"))
+  (_domainkey :dname stratocaster.dkim.distorted.org.uk.))

diff --git a/hosts.lisp b/hosts.lisp
index 79c07e5..8add49a 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -6,8 +6,8 @@
 ;;; External hosts.
 
 (defhost boyle.nsict.org ((:ipv4 "85.158.42.162")))
-(defhost chiark.greenend.org.uk ((:ipv4 "212.13.197.229")
-                                #+chiark-dns-ipv6 (:ipv6 "2001:ba8:1e3::")))
+(defhost chiark.greenend.org.uk ((:ipv4 "93.93.131.173")
+                                (:ipv6 "2a00:1098:86:130::1")))
 (defhost mccoy.flatline.org.uk "80.74.241.31")
 (defhost mythic-ns1 ((:ipv4 "45.33.127.156")
                     (:ipv6 "2600:3c00:e000:19::1")))
@@ -33,7 +33,6 @@
       (dhcp "32/27"))
     (vpn "128/27")
     (its "160/30")
-    (colo "176/28")
     (safe "192/27")
     (any "224/27")))
 
@@ -44,22 +43,15 @@
 (defnet distorted.org.uk-aaisp "2001:8b0:c92/48"
   (unsafe "1/64"
     (dhcp "6468:6370/96"))
-  (nany "0/64")
+  (any "0/64")
   (dmz "fff/64")
   (safe "4001/64")
-  (nvpn "6000/64")
-  (untrusted "8001/64")
-  (nupn "a000/64"))
-
-;; Externally routed colo range.
-(defnet jump "212.13.198.66/28")
-(defnet jump "2001:ba8:0:1d9/64")
-(defnet distorted.org.uk-jump "2001:ba8:1d9/48"
-  (colo "2/64")
-  (any "0/64")
   (vpn "6000/64")
+  (untrusted "8001/64")
   (upn "a000/64"))
 
+(defnet jump-ipv6 "2001:ba8:1d9/48")
+
 ;;;--------------------------------------------------------------------------
 ;;; Host allocations
 
@@ -75,18 +67,6 @@
 (defhost anon.dmz (dmz 12))
 (defhost nat.dmz ((:ipv4 dmz 14)))
 
-;; Colocated addresses.
-(defhost gate.jump ((:ipv6 jump 2)))
-(defhost fender.jump (jump 5))
-(defhost precision.jump (jump 6))
-(defhost telecaster.jump (jump 7))
-(defhost stratocaster.jump (jump 8))
-(defhost jazz.jump (jump 9))
-(defhost marshall.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
-(defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
-(defhost anon.jump (jump 13))
-(defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
-
 ;; Formerly colocated addresses.
 (defhost precision.dmz ((:ipv4 dmz1 1) (:ipv6 dmz 33)))
 (defhost telecaster.dmz ((:ipv4 dmz1 2) (:ipv6 dmz 34)))
@@ -97,6 +77,10 @@
 (defhost richmond.dmz ((:ipv4 dmz1 12) (:ipv6 dmz "::1:1")))
 (defhost blackhole.dmz ((:ipv4 dmz1 14) (:ipv6 dmz "::ffff")))
 
+;; Jump virtual hosts.
+(defhost eggle.jump ((:ipv4 "185.73.44.143")
+                    (:ipv6 jump-ipv6 "8002::1")))
+
 ;; Linode virtual hosts.
 (defhost national.linode ((:ipv4 "45.33.118.239")
                          (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))
@@ -155,22 +139,10 @@
 (defhost spirit.vpn ((:ipv4 vpn 9) (:ipv6 vpn "::9:1")))
 (defhost groove.vpn ((:ipv4 vpn 10) (:ipv6 vpn "::10:1")))
 
-(defhost crybaby.nvpn ((:ipv6 nvpn "::1:1")))
-(defhost orange.nvpn ((:ipv6 nvpn "::3:1")))
-(defhost haze.nvpn ((:ipv6 nvpn "::4:1")))
-(defhost radius.nvpn ((:ipv6 nvpn "::5:1")))
-(defhost precision.nvpn ((:ipv6 nvpn "::6:1")))
-(defhost jazz.nvpn ((:ipv6 nvpn "::7:1")))
-(defhost vampire.nvpn ((:ipv6 nvpn "::8:1")))
-(defhost spirit.nvpn ((:ipv6 nvpn "::9:1")))
-(defhost groove.nvpn ((:ipv6 nvpn "::10:1")))
-
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
 (defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::2:1")))
-
-(defhost national.nupn ((:ipv6 nupn "::1:1")))
-(defhost mdwdev.nupn ((:ipv6 nupn "::2:1")))
+(defhost eggle.upn ((:ipv4 upn 3) (:ipv6 upn "::3:1")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -185,13 +157,6 @@
 (defhost gw.its (its 1))
 (defhost mz.its (its 2))
 
-;; Internal (VPN) addresses for colocated services.
-(defhost fender.colo (colo 1))
-(defhost precision.colo (colo 2))
-(defhost telecaster.colo (colo 3))
-(defhost stratocaster.colo (colo 4))
-(defhost jazz.colo (colo 5))
-
 ;; Anycast addresses for services.
 (defhost dns0.any ((:ipv4 any 0) (:ipv6 any "::0:1")))
 (defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:1")))
@@ -201,34 +166,28 @@
 (defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:1")))
 (defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:1")))
 
-(defhost dns0.nany ((:ipv6 nany "::0:1")))
-(defhost dns1.nany ((:ipv6 nany "::1:1")))
-(defhost ntp0.nany ((:ipv6 nany "::2:1")))
-(defhost ntp1.nany ((:ipv6 nany "::3:1")))
-(defhost www-cache.nany ((:ipv6 nany "::4:1")))
-(defhost krb0.nany ((:ipv6 nany "::5:1")))
-(defhost krb1.nany ((:ipv6 nany "::6:1")))
-
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 (preferred-subnet-case
-  ((unsafe colo)
+  (unsafe
    (defhost radius radius.unsafe)
    (defhost vampire vampire.unsafe)
-   (defhost precision precision.colo)
-   (defhost telecaster telecaster.colo)
-   (defhost stratocaster stratocaster.colo)
-   (defhost national national.upn))
+   (defhost precision precision.unsafe)
+   (defhost telecaster telecaster.unsafe)
+   (defhost stratocaster stratocaster.unsafe)
+   (defhost national national.upn)
+   (defhost eggle eggle.upn))
   (t
    (defhost radius radius.dmz)
    (defhost vampire vampire.dmz)
-   (defhost precision precision.jump)
-   (defhost telecaster telecaster.jump)
-   (defhost stratocaster stratocaster.jump)
-   (defhost national national.linode)))
+   (defhost precision precision.dmz)
+   (defhost telecaster telecaster.dmz)
+   (defhost stratocaster stratocaster.dmz)
+   (defhost national national.linode)
+   (defhost eggle eggle.jump)))
 
-(defhost marshall marshall.jump)
+(defhost marshall marshall.dmz)
 (defhost mdwdev mdwdev.upn)
 
 ;;;----- That's all, folks --------------------------------------------------

diff --git a/odin.lisp b/odin.lisp
index f17fc24..9968dd2 100644 (file)
--- a/odin.lisp
+++ b/odin.lisp
@@ -26,7 +26,10 @@
   ;; Mail servers
   :mx ((mail :ip stratocaster))
   :srv ((:smtp mail))
-
-  (stratocaster.20140403._domainkey
-   :dkim ("stratocaster-20140403"
-         :v "DKIM1" :k "rsa" :h "sha256" :s "email")))
+  :spf ((:version "spf1")
+       (:pass :ip stratocaster.dmz)
+       (:soft :all))
+  (_dmarc :dmarc (:v "DMARC1"
+                 :p "quarantine" :sp "quarantine"
+                 :adkim "s" :aspf "s"))
+  (_domainkey :dname stratocaster.dkim.distorted.org.uk.))