From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 8 Apr 2013 12:25:07 +0000 (+0100)
Subject: hosts.lisp, distorted.lisp: Move anonymity services to jazz.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/0865ffd5c82f41cab2f3fdfb41c7b39685b34b9c

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

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))
diff --git a/hosts.lisp b/hosts.lisp
index 67b207c..9e3cabf 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -58,6 +58,7 @@ (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
 (defhost richmond.jump (jump 12))
+(defhost anon.jump (jump 13))
 (defhost blackhole.jump (jump 14))
 
 ;; Unsafe network.