hosts.lisp, distorted.lisp: Set up `safe' subnet.

Add interfaces on vampire and radius; move evolution to the new subnet.

diff --git a/distorted.lisp b/distorted.lisp
index 90f5d882865ee67f5c788a41214b0618b417b813..b6fea92fcba211aa0ed09bc19a16420197c08333 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -48,7 +48,7 @@ (defzone distorted.org.uk
 
   ;; Wireless gateway.
   (wireless :net wireless)
-  (evolution (untrusted :a evolution.untrusted))
+  (evolution (safe :a evolution.safe))
 
   ;; Local services.
   :svc vampire
@@ -85,6 +85,7 @@ (defzone distorted.org.uk
   (untrusted :net untrusted)
   (vampire (unsafe :a vampire.unsafe)
           (dmz :a vampire.dmz)
+          (safe :a vampire.safe)
           (untrusted :a vampire.untrusted)
           (iodine :a vampire.iodine))
   (obsidian (safe :a obsidian.safe))
@@ -92,6 +93,7 @@ (defzone distorted.org.uk
          (dmz :a ibanez.dmz))
   (radius (unsafe :a radius.unsafe)
          (dmz :a radius.dmz)
+         (safe :a radius.safe)
          (untrusted :a radius.untrusted))
   (roadstar (unsafe :a roadstar.unsafe)
            (dmz :a roadstar.dmz))

diff --git a/hosts.lisp b/hosts.lisp
index e29c30bc1e08515628a82f1743dd4ded48e3f23c..8fc9924df9ae4000324e6f6ceca04bb21e3d4ff3 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -66,8 +66,9 @@ (defhost vampire.unsafe (unsafe 5))
 (defhost ibanez.unsafe (unsafe 14))
 
 ;; Safe network.
-(defhost tubescreamer.safe (safe 1))
-(defhost obsidian.safe (safe 2))
+(defhost radius.safe (safe 1))
+(defhost vampire.safe (safe 2))
+(defhost evolution.safe (safe 3))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))