distorted.lisp: Use the proper address for `guvnor' internally.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 6e821fb..0bf09f2 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -84,8 +84,7 @@
 
   ;; 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))
 
@@ -114,8 +113,10 @@
   #+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))
@@ -174,7 +175,6 @@
   (crybaby (vpn :a crybaby.vpn))
   (terror (vpn :a terror.vpn))
   (orange (vpn :a orange.vpn))
-  (mango (vpn :a mango.vpn))
   (iodine :net iodine)
 
   ;; ITS.