distorted.lisp, odin.lisp: Move main mail service to stratocaster.

And there was much rejoicing.

diff --git a/distorted.lisp b/distorted.lisp
index ddeb6ff43dd08d07b1e70eab07a0d657b2e7a0e9..b5b12d1f93d521e3ffead350fef2de23353dd05b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,10 +25,13 @@ (defzone distorted.org.uk
                     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail lists bugs cryptomail)
-   :ttl 300
+  ((@ mail)
    :mx mail
    :srv ((:smtp mail)))
+  ((lists bugs cryptomail)
+   :ttl 300
+   :mx mail
+   :srv ((:smtp old-mail)))
 
   ;; Anycast services.
   (dns0 (any :a dns0.any)
@@ -97,8 +100,8 @@ (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)
@@ -108,7 +111,7 @@ (defzone distorted.org.uk
         (dmz :svc artist.dmz))
   (pifi (vpn :svc orange.vpn)
        (dmz :svc artist.dmz))
-  ((ftp rsync wiki bugs mail db i2p) :svc vampire)
+  ((ftp rsync wiki bugs old-mail db i2p) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)

diff --git a/odin.lisp b/odin.lisp
index 8263a747eb400adc323a20c0aef44d3c1d0402d4..3d481f76e78985c333e70b69232b394678459ed9 100644 (file)
--- a/odin.lisp
+++ b/odin.lisp
@@ -17,6 +17,5 @@ (defzone odin.gg
   ((@ www) :svc stratocaster)
 
   ;; Mail servers
-  (@ :ttl 300
-     :mx ((mail :ip vampire))
-     :srv ((:smtp mail))))
+  :mx ((mail :ip stratocaster))
+  :srv ((:smtp mail)))