distorted.lisp: Point `pifi' to `orange.dhcp' internally.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index acf66c62290295c338e9e791e1207283d401054e..67c90b0d5a5abe7212a65ec0554c7bc0b596748b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,9 +25,13 @@ (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)))
 
   ;; Anycast services.
   (dns0 (any :a dns0.any)
@@ -84,8 +88,7 @@ (defzone distorted.org.uk
 
   ;; 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,10 +98,10 @@ (defzone distorted.org.uk
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc jazz.colo)
-       (jump :svc jazz.jump))
-  ((git www) (colo :svc stratocaster.colo)
-            (jump :svc stratocaster.jump))
+  ((irc vox) (colo :svc jazz.colo)
+            (jump :svc jazz.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)
@@ -106,16 +109,18 @@ (defzone distorted.org.uk
   ;; Local services.
   (rawk (unsafe :svc artist.unsafe)
         (dmz :svc artist.dmz))
-  (pifi (vpn :svc orange.vpn)
+  (pifi (untrusted :cname orange.dhcp)
        (dmz :svc artist.dmz))
-  ((ftp rsync wiki bugs mail db i2p vox) :svc vampire)
+  ((ftp rsync wiki bugs old-mail db i2p) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
 
   ;; 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))
@@ -137,6 +142,9 @@ (defzone distorted.org.uk
        (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))
 
@@ -159,7 +167,8 @@ (defzone distorted.org.uk
   (jem (unsafe :a jem.unsafe)
        (dmz :a jem.dmz))
   (artist (unsafe :a artist.unsafe)
-         (dmz :a artist.dmz))
+         (dmz :a artist.dmz)
+         (untrusted :a artist.untrusted))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
@@ -173,7 +182,6 @@ (defzone distorted.org.uk
   (crybaby (vpn :a crybaby.vpn))
   (terror (vpn :a terror.vpn))
   (orange (vpn :a orange.vpn))
-  (mango (vpn :a mango.vpn))
   (iodine :net iodine)
 
   ;; ITS.