X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/625b0fd3f3db5b55cf8b17aced2beaeb477e5eb9..0865ffd5c82f41cab2f3fdfb41c7b39685b34b9c:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 5f88295..b2f71ce 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -85,7 +85,6 @@ (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))
   (gate (dmz :a gate.dmz))
   (nat (dmz :a nat.dmz))
 
@@ -114,8 +113,10 @@ (defzone distorted.org.uk
   #+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))