X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/cfecfa5c7026df1806a0725f2fb45b5ed992d4cc..3503589d50bb3d820ecd5f81a6e61b2113562bf2:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a3672cf..a9a2b1f 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,9 +25,17 @@
 		     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail lists bugs cryptomail)
+  ((@ 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"))
 
   ;; Anycast services.
   (dns0 (any :a dns0.any)
@@ -84,8 +92,7 @@
 
   ;; Entry is via little router box.
   (dmz :net dmz)
-  (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
-  (anon (dmz :a anon.dmz))
+  (guvnor (dmz :a guvnor.dmz))
   (gate (dmz :a gate.dmz))
   (nat (dmz :a nat.dmz))
 
@@ -95,20 +102,31 @@
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc jazz.colo)
-       (jump :svc jazz.jump))
-  (cabal :svc stratocaster.colo)
+  ((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"))
 
   ;; Local services.
-  ((rawk) :svc artist)
-  ((@ www ftp rsync wiki git bugs mail db i2p vox) :svc vampire)
+  ((rawk pifi) (unsafe :svc artist.unsafe)
+	       (dmz :svc artist.dmz))
+  (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
+	  (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
+  ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire")
 
   ;; Internal services.
-  #+view/inside ((news lpr) :svc vampire.unsafe)
+  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
 
   ;; Anonymity services.
-  (tor :svc #+view/inside vampire.unsafe
-	    #-view/inside anon.dmz)
+  (anon (colo :svc jazz.colo)
+	(unsafe :svc vampire.unsafe)
+	(jump :a anon.jump)
+	(dmz :a anon.dmz))
 
   ;; Fancy connectivity.
   (iodine (jump :a jazz.jump))
@@ -116,19 +134,22 @@
   ;; Colocated hosts.
   (colo :net colo)
   (jump :net jump)
-  (fender (colo :a fender.colo)
-	  (jump :a fender.jump))
-  (precision (colo :a precision.colo)
-	     (jump :a precision.jump))
-  (telecaster (colo :a telecaster.colo)
-	      (jump :a telecaster.jump))
+  (fender (colo :a fender.colo :sshfp "fender")
+	  (jump :a fender.jump :sshfp "fender"))
+  (precision (colo :a precision.colo :sshfp "precision")
+	     (jump :a precision.jump :sshfp "precision"))
+  (telecaster (colo :a telecaster.colo :sshfp "telecaster")
+	      (jump :a telecaster.jump :sshfp "telecaster"))
   (telecaster :alias tele)
-  (stratocaster (colo :a stratocaster.colo)
-		(jump :a stratocaster.jump))
+  (stratocaster (colo :a stratocaster.colo :sshfp "stratocaster")
+		(jump :a stratocaster.jump :sshfp "stratocaster"))
   (stratocaster :alias strat)
-  (jazz (colo :a jazz.colo)
-	(jump :a jazz.jump)
-	(iodine :a jazz.iodine))
+  (jazz (colo :a jazz.colo :sshfp "jazz")
+	(jump :a jazz.jump :sshfp "jazz")
+	(iodine :a jazz.iodine :sshfp "jazz"))
+
+  ;; Media server (on loan to Good Technology HSTG).
+  (jaguar (jump :a jaguar.jump))
 
   ;; Nicko's server.
   (richmond (jump :a richmond.jump))
@@ -137,22 +158,23 @@
   (unsafe :net unsafe)
   (safe :net safe)
   (untrusted :net untrusted)
-  (vampire (unsafe :a vampire.unsafe)
-	   (dmz :a vampire.dmz)
-	   (safe :a vampire.safe)
-	   (untrusted :a vampire.untrusted))
-  (ibanez (unsafe :a ibanez.unsafe)
-	  (dmz :a ibanez.dmz))
-  (radius (unsafe :a radius.unsafe)
-	  (dmz :a radius.dmz)
-	  (safe :a radius.safe)
-	  (untrusted :a radius.untrusted))
-  (roadstar (unsafe :a roadstar.unsafe)
-	    (dmz :a roadstar.dmz))
-  (jem (unsafe :a jem.unsafe)
-       (dmz :a jem.dmz))
-  (artist (unsafe :a artist.unsafe)
-	  (dmz :a artist.dmz))
+  (vampire (unsafe :a vampire.unsafe :sshfp "vampire")
+	   (dmz :a vampire.dmz :sshfp "vampire")
+	   (safe :a vampire.safe :sshfp "vampire")
+	   (untrusted :a vampire.untrusted :sshfp "vampire"))
+  (ibanez (unsafe :a ibanez.unsafe :sshfp "ibanez")
+	  (dmz :a ibanez.dmz :sshfp "ibanez"))
+  (radius (unsafe :a radius.unsafe :sshfp "radius")
+	  (dmz :a radius.dmz :sshfp "radius")
+	  (safe :a radius.safe :sshfp "radius")
+	  (untrusted :a radius.untrusted :sshfp "radius"))
+  (roadstar (unsafe :a roadstar.unsafe :sshfp "roadstar")
+	    (dmz :a roadstar.dmz :sshfp "roadstar"))
+  (jem (unsafe :a jem.unsafe :sshfp "jem")
+       (dmz :a jem.dmz :sshfp "jem"))
+  (artist (unsafe :a artist.unsafe :sshfp "artist")
+	  (dmz :a artist.dmz :sshfp "artist")
+	  (untrusted :a artist.untrusted :sshfp "artist"))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
@@ -163,8 +185,9 @@
 
   ;; Virtual network.
   (vpn :net vpn)
-  (crybaby (vpn :a crybaby.vpn))
-  (terror (vpn :a terror.vpn))
+  (crybaby (vpn :a crybaby.vpn :sshfp "crybaby"))
+  (terror (vpn :a terror.vpn :sshfp "terror"))
+  (orange (vpn :a orange.vpn :sshfp "orange"))
   (iodine :net iodine)
 
   ;; ITS.
@@ -179,6 +202,9 @@
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (vampire.ns.dhcp :ip vampire)))
+  (dyn :ns ((radius.ns.dyn :ip radius)
+	    (precision.ns.dyn :ip precision)
+	    (vampire.ns.dyn :ip vampire)))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
 	       (precision.ns.dnserr :ip precision.jump)
 	       (vampire.ns.dnserr :ip vampire.dmz)))
@@ -199,8 +225,7 @@
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (vampire.ns.dhcp :ip vampire)))
-  :cidr-delegation
-  (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
+  :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
 (defrevzone dmz
   :ns ((radius.ns :ip radius)