hosts.lisp, distorted.lisp: Move anonymity services to jazz.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 5f88295ab060e104a01afa54fd2e7dc56da59084..b2f71ce3cade837345db309ba5dc8e72e1b4a315 100644 (file)
--- 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))
   ;; 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))
 
   (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.
   #+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))
 
   ;; Fancy connectivity.
   (iodine (jump :a jazz.jump))