X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/0fa108c4e22efbc652a39a15960190dd4745c774..69bbb181a3b0ca12644af37a61e350bf6a064a16:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 0bf09f2..0806e78 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,9 +25,20 @@
 		     (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 ("dkim-stratocaster.20140403.pub"
+	  :v "DKIM1"
+	  :k "rsa"
+	  :h "sha256"
+	  :s "email"))
 
   ;; Anycast services.
   (dns0 (any :a dns0.any)
@@ -96,26 +107,28 @@
   ;; Colocated services.
   ((irc vox) (colo :svc jazz.colo)
 	     (jump :svc jazz.jump))
-  ((git www) (colo :svc stratocaster.colo)
-	     (jump :svc stratocaster.jump))
+  ((git www mail) (colo :svc stratocaster.colo)
+		  (jump :svc stratocaster.jump))
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo)
+  ((db ftp) (colo :svc telecaster.colo)
+	    (jump :svc telecaster.jump))
 
   ;; Local services.
-  (rawk (unsafe :svc artist.unsafe)
-        (dmz :svc artist.dmz))
-  (pifi (vpn :svc orange.vpn)
-	(dmz :svc artist.dmz))
-  ((ftp rsync wiki bugs mail db i2p) :svc vampire)
+  ((rawk pifi) (unsafe :svc artist.unsafe)
+	       (dmz :svc artist.dmz))
+  (mirror (dmz :svc roadstar.dmz)
+	  (unsafe :svc roadstar.unsafe))
+  ((wiki bugs old-mail i2p) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
 
   ;; 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.
@@ -138,6 +151,9 @@
 	(jump :a jazz.jump)
 	(iodine :a jazz.iodine))
 
+  ;; Media server (on loan to Good Technology HSTG).
+  (jaguar (jump :a jaguar.jump))
+
   ;; Nicko's server.
   (richmond (jump :a richmond.jump))