hosts.lisp, distorted.lisp: Separate address for anonymity services.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 02dd2e3b46b24bf25cf40141d2655c77958c1e7e..8325a9232825775446a184767db83e16af7a81b1 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -42,6 +42,7 @@ (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))
 
@@ -51,13 +52,17 @@ (defzone distorted.org.uk
 
   ;; Local services.
   :svc vampire
-  ((www krb ftp rsync wiki git bugs mail db tor i2p rawk vox www-cache)
+  ((www krb ftp rsync wiki git bugs mail db i2p rawk vox www-cache)
    :svc vampire)
 
   ;; Internal services.
   #+view/inside ((ntp) :svc ibanez.unsafe)
   #+view/inside ((wpad ntp1 news) :svc vampire.unsafe)
 
+  ;; Anonymity services.
+  (tor :svc #+view/inside vampire.unsafe
+           #-view/inside anon.dmz)
+
   ;; Wired ethernet.
   (wired :net wired)
   (vampire (unsafe :a vampire.unsafe)