distorted: Add a service name for the Tor onion router.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 416a37be46d4429cdf1cc9dcb5d6c30e0063cebe..60f854ef9c63abaad838d482c828b32a00494c62 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,7 +25,7 @@ (defhost guvnor.demon 80.177.3.76)
 ;; Unsafe network.
 (defhost guvnor (unsafe 1))
 (defhost metalzone (unsafe 2))
 ;; Unsafe network.
 (defhost guvnor (unsafe 1))
 (defhost metalzone (unsafe 2))

-(defhost evolution.fretwank (unsafe 3))
+;;(defhost evolution.fretwank (unsafe 3))

 (defhost vampire (unsafe 4))
 
 ;; Safe network.
 (defhost vampire (unsafe 4))
 
 ;; Safe network.


@@ -86,24 +86,21 @@ (defzone distorted.org.uk
   ;;
   ;; Wireless gateway
   (untrusted :net untrusted)
   ;;
   ;; Wireless gateway
   (untrusted :net untrusted)

-  (evolution
-   :a evolution
-   (untrusted :a evolution)
-   (fretwank :a evolution.fretwank))
+  (evolution (untrusted :a evolution))

   ;;
   ;; Local services
   (@ :svc www-frontend)
   ((www ftp wiki git bugs mail rawk)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
   ;;
   ;; Local services
   (@ :svc www-frontend)
   ((www ftp wiki git bugs mail rawk)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))

-  ((db)
+  ((db tor)

    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
   (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
   ;;
   ;; Internal services
    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
   (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
   ;;
   ;; Internal services

-  ((news ntp) (fretwank :svc metalzone))
-  ((www-cache wpad ntp1) (fretwank :svc vampire))
+  ((news ntp1) (fretwank :svc metalzone))
+  ((www-cache wpad ntp) (fretwank :svc vampire))

   ;;
   ;; Wired ethernet
   (fretwank :net fretwank)
   ;;
   ;; Wired ethernet
   (fretwank :net fretwank)