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 8ab90af..416a37b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,7 +25,7 @@
 ;; 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.
@@ -33,8 +33,8 @@
 (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))
@@ -51,7 +51,7 @@
 
 (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.)
@@ -86,7 +86,10 @@
   ;;
   ;; 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)