From d85367121b47974387178add7ebe776f01ba5167 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 12 Mar 2012 14:34:40 +0000 Subject: [PATCH] hosts.lisp, distorted.lisp: Set up `safe' subnet. Organization: Straylight/Edgeware From: Mark Wooding Add interfaces on vampire and radius; move evolution to the new subnet. --- distorted.lisp | 4 +++- hosts.lisp | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index 90f5d88..b6fea92 100644 --- 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 e29c30b..8fc9924 100644 --- 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)) -- [mdw]