X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/6cf321215d955cabbe6f549c5c18fae4cbfddcb6..be5a78bf69376e5423909a568e805c18cbacb66e:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 35243bc..dd52e09 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -91,44 +91,27 @@
 	  :v "DKIM1" :k "rsa" :h "sha256" :s "email"))
 
   ;; 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 +126,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 +155,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))
@@ -188,81 +171,47 @@
   ((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 :abbrev n (linode :abbrev nl) (upn :abbrev ny))
   (national (linode :addr national.linode)
-	    (upn :addr national.upn)
-	    (nupn :addr national.nupn))
-  (mdwdev (upn :addr mdwdev.upn)
-	  (nupn :addr mdwdev.nupn))
+	    (upn :addr national.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 +244,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 +277,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 +290,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,8 +310,7 @@
   (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)
@@ -395,25 +334,23 @@
 	     #.(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))))
+  (io :ns ((ns.io :ip jazz.dmz))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 (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)
+       (precision.ns :ip precision.dmz)
+       (telecaster.ns :ip telecaster.dmz)
        (national.ns :ip national.linode))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
@@ -432,7 +369,7 @@
        (national.ns :ip national)))
 
 (defzone nicko.org
-  (richmond :addr richmond.jump))
+  (richmond :addr richmond.dmz))
 
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
@@ -442,7 +379,6 @@
        national.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
-  :reverse colo
   :reverse its
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
@@ -493,30 +429,6 @@
        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.
@@ -538,16 +450,8 @@
        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)
-
 (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 --------------------------------------------------