distorted: Renumbering evolution.

evolution is no longer the gateway to the untrusted net -- that's going
to be vampire now.  Accordingly, give vampire.untrusted the .1 address.

Eventually, evolution simply won't need to exist on the trusted net, but
that's overly annoying right now.  So its default name now corresponds
to its untrusted address, and the trusted .3 address will vanish later.

diff --git a/distorted.lisp b/distorted.lisp
index 8ab90aff09475b5ab245d5ad96a9f4020b0569f9..416a37be46d4429cdf1cc9dcb5d6c30e0063cebe 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,7 +86,10 @@ (defzone distorted.org.uk
   ;;
   ;; Wireless gateway
   (untrusted :net untrusted)
   ;;
   ;; Wireless gateway
   (untrusted :net untrusted)

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

   ;;
   ;; Local services
   (@ :svc www-frontend)
   ;;
   ;; Local services
   (@ :svc www-frontend)