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

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8ab90aff09475b5ab245d5ad96a9f4020b0569f9..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 (unsafe 3))
+;;(defhost evolution.fretwank (unsafe 3))

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


@@ -33,8 +33,8 @@ (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
 
 ;; Wireless network.
 (defhost obsidian (safe 2))
 
 ;; Wireless network.

-(defhost evolution.untrusted (untrusted 1))
-(defhost vampire.untrusted (untrusted 2))
+(defhost vampire.untrusted (untrusted 1))
+(defhost evolution (untrusted 2))

 
 ;; Virtual private network.
 (defhost crybaby (virtual 1))
 
 ;; Virtual private network.
 (defhost crybaby (virtual 1))


@@ -51,7 +51,7 @@ (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
 (preferred-subnet-case
   (fretwank
 
 (preferred-subnet-case
   (fretwank

-   (setf *default-zone-source* 'metalzone.distorted.org.uk.)
+   (setf *default-zone-source* 'vampire.distorted.org.uk.)

    (defhost www-frontend metalzone))
   (t
    (setf *default-zone-source* 'guvnor.distorted.org.uk.)
    (defhost www-frontend metalzone))
   (t
    (setf *default-zone-source* 'guvnor.distorted.org.uk.)


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

-  (evolution (fretwank :a evolution) (untrusted :a evolution.untrusted))
+  (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)