distorted.lisp: Define addresses for all of the new machines.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c4a3fe6212b0e855719b9676bdb2b3744f4e793c..ed0980887c441854c58f9b61874e0515000ceb60 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -27,12 +27,16 @@ (defhost guvnor.demon 80.177.3.76)
 ;; Unsafe network.
 (defhost guvnor (unsafe 1))
 (defhost metalzone (unsafe 2))
-;;(defhost evolution.fretwank (unsafe 3))
+(defhost radius (unsafe 3))
 (defhost vampire (unsafe 4))
+(defhost roadstar (unsafe 5))
+(defhost jem (unsafe 6))
+(defhost artist (unsafe 7))
 
 ;; Safe network.
 (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
+(defhost ibanez (safe 3))
 
 ;; Wireless network.
 (defhost vampire.untrusted (untrusted 1))
@@ -101,14 +105,13 @@ (defzone distorted.org.uk
   ((www ftp wiki git bugs mail)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
-  ((db tor i2p rawk)
+  ((db tor i2p rawk vox www-cache)
    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
-  (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
   ;;
   ;; Internal services.
   ((ntp1) (fretwank :svc metalzone))
-  ((www-cache wpad ntp news) (fretwank :svc vampire))
+  ((wpad ntp news) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet.
   (fretwank :net fretwank)
@@ -118,6 +121,14 @@ (defzone distorted.org.uk
           (untrusted :a vampire.untrusted)
           (iodine :a vampire.iodine))
   (obsidian (fretwank :a obsidian))
+  (ibanez (fretwank :a ibanez))
+  (radius (fretwank :a radius))
+  (roadstar (fretwank :a roadstar))
+  (jem (fretwank :a jem))
+  (artist (fretwank :a artist))
+  (gibson :cname gibson.dhcp)
+  (lespaul :cname lespaul.dhcp)
+  (firebird :cname firebird.dhcp)
   ;;
   ;; Virtual network.
   (virtual :net virtual)