Domain keys support.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 0cdd8b364816a748c012cfdf76e5db188e33d2b9..0806e78534bc78281b5764d6970e32ff3a8df09f 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,9 +25,20 @@ (defzone distorted.org.uk
                     (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 @@ (defzone distorted.org.uk
   ;; 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.