X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/9a93662e70df95aba3a7f4cc24e8970e4e698396..8c8a56816856f5f2688c812adda309d1fd1dfa09:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 1b4905a..1fca34e 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -33,6 +33,13 @@
    :mx mail
    :srv ((:smtp old-mail)))
 
+  (stratocaster.20140403._domainkey
+   :dkim ("dkim-stratocaster.20140403.pub"
+	  :v "DKIM1"
+	  :k "rsa"
+	  :h "sha256"
+	  :s "email"))
+
   ;; Anycast services.
   (dns0 (any :a dns0.any)
 	(jump :svc precision.jump)
@@ -98,32 +105,30 @@
   (evolution :alias evo)
 
   ;; Colocated services.
-  ((irc vox) (colo :svc jazz.colo)
-	     (jump :svc jazz.jump))
-  ((git www mail) (colo :svc stratocaster.colo)
-		  (jump :svc stratocaster.jump))
+  ((irc vox) (colo :svc jazz.colo :sshfp "jazz.sshfp")
+	     (jump :svc jazz.jump :sshfp "jazz.sshfp"))
+  ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster.sshfp")
+		  (jump :svc stratocaster.jump :sshfp "stratocaster.sshfp"))
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
-  (cabal :svc stratocaster.colo)
-  ((db ftp) (colo :svc telecaster.colo)
-	    (jump :svc telecaster.jump))
+  (cabal :svc stratocaster.colo :sshfp "stratocaster.sshfp")
+  ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster.sshfp")
+	    (jump :svc telecaster.jump :sshfp "telecaster.sshfp"))
 
   ;; Local services.
-  (rawk (unsafe :svc artist.unsafe)
-        (dmz :svc artist.dmz))
-  (pifi (untrusted :cname orange.dhcp)
-	(dmz :svc artist.dmz))
-  (mirror (dmz :svc roadstar.dmz)
-	  (unsafe :svc roadstar.unsafe))
-  ((wiki bugs old-mail i2p) :svc vampire)
+  ((rawk pifi) (unsafe :svc artist.unsafe)
+	       (dmz :svc artist.dmz))
+  (mirror (dmz :svc roadstar.dmz :sshfp "roadstar.sshfp")
+	  (unsafe :svc roadstar.unsafe :sshfp "roadstar.sshfp"))
+  ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire.sshfp")
 
   ;; Internal services.
-  #+view/inside ((news lpr) :svc vampire.unsafe)
+  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire.sshfp")
 
   ;; Anonymity services.
   (anon (colo :svc jazz.colo)
-        (unsafe :svc vampire.unsafe)
-        (jump :a anon.jump)
+	(unsafe :svc vampire.unsafe)
+	(jump :a anon.jump)
 	(dmz :a anon.dmz))
 
   ;; Fancy connectivity.
@@ -132,19 +137,19 @@
   ;; 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.sshfp")
+	  (jump :a fender.jump :sshfp "fender.sshfp"))
+  (precision (colo :a precision.colo :sshfp "precision.sshfp")
+	     (jump :a precision.jump :sshfp "precision.sshfp"))
+  (telecaster (colo :a telecaster.colo :sshfp "telecaster.sshfp")
+	      (jump :a telecaster.jump :sshfp "telecaster.sshfp"))
   (telecaster :alias tele)
-  (stratocaster (colo :a stratocaster.colo)
-		(jump :a stratocaster.jump))
+  (stratocaster (colo :a stratocaster.colo :sshfp "stratocaster.sshfp")
+		(jump :a stratocaster.jump :sshfp "stratocaster.sshfp"))
   (stratocaster :alias strat)
-  (jazz (colo :a jazz.colo)
-	(jump :a jazz.jump)
-	(iodine :a jazz.iodine))
+  (jazz (colo :a jazz.colo :sshfp "jazz.sshfp")
+	(jump :a jazz.jump :sshfp "jazz.sshfp")
+	(iodine :a jazz.iodine :sshfp "jazz.sshfp"))
 
   ;; Media server (on loan to Good Technology HSTG).
   (jaguar (jump :a jaguar.jump))
@@ -156,23 +161,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)
-	  (untrusted :a artist.untrusted))
+  (vampire (unsafe :a vampire.unsafe :sshfp "vampire.sshfp")
+	   (dmz :a vampire.dmz :sshfp "vampire.sshfp")
+	   (safe :a vampire.safe :sshfp "vampire.sshfp")
+	   (untrusted :a vampire.untrusted :sshfp "vampire.sshfp"))
+  (ibanez (unsafe :a ibanez.unsafe :sshfp "ibanez.sshfp")
+	  (dmz :a ibanez.dmz :sshfp "ibanez.sshfp"))
+  (radius (unsafe :a radius.unsafe :sshfp "radius.sshfp")
+	  (dmz :a radius.dmz :sshfp "radius.sshfp")
+	  (safe :a radius.safe :sshfp "radius.sshfp")
+	  (untrusted :a radius.untrusted :sshfp "radius.sshfp"))
+  (roadstar (unsafe :a roadstar.unsafe :sshfp "roadstar.sshfp")
+	    (dmz :a roadstar.dmz :sshfp "roadstar.sshfp"))
+  (jem (unsafe :a jem.unsafe :sshfp "jem.sshfp")
+       (dmz :a jem.dmz :sshfp "jem.sshfp"))
+  (artist (unsafe :a artist.unsafe :sshfp "artist.sshfp")
+	  (dmz :a artist.dmz :sshfp "artist.sshfp")
+	  (untrusted :a artist.untrusted :sshfp "artist.sshfp"))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
@@ -183,9 +188,9 @@
 
   ;; Virtual network.
   (vpn :net vpn)
-  (crybaby (vpn :a crybaby.vpn))
-  (terror (vpn :a terror.vpn))
-  (orange (vpn :a orange.vpn))
+  (crybaby (vpn :a crybaby.vpn :sshfp "crybaby.sshfp"))
+  (terror (vpn :a terror.vpn :sshfp "terror.sshfp"))
+  (orange (vpn :a orange.vpn :sshfp "orange.sshfp"))
   (iodine :net iodine)
 
   ;; ITS.