distorted.lisp: Whitespace cleanup.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 67c90b0d5a5abe7212a65ec0554c7bc0b596748b..9bd838f71b5c9d9554eab582032fedf299aa1949 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -105,21 +105,23 @@ (defzone distorted.org.uk
   :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 (untrusted :cname orange.dhcp)
-       (dmz :svc artist.dmz))
-  ((ftp rsync wiki bugs old-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.