X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/7e0deea4532145fce55025ef48abe1aeee2e69c3..3dfd711ecbc0ef973de2ec51a56559e11665327f:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 5559e06..c7fd629 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -32,15 +32,16 @@ (defhost vampire (unsafe 4))
 (defhost roadstar (unsafe 5))
 (defhost jem (unsafe 6))
 (defhost artist (unsafe 7))
+(defhost ibanez (unsafe 14))
 
 ;; Safe network.
 (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
-(defhost ibanez (safe 3))
 
 ;; Wireless network.
 (defhost vampire.untrusted (untrusted 1))
 (defhost evolution (untrusted 2))
+(defhost radius.untrusted (untrusted 3))
 
 ;; Virtual private network.
 (defhost crybaby (virtual 1))
@@ -77,7 +78,8 @@ (defzone distorted.org.uk
   ;; Nameservers.
   :ns #+subnet/fretwank ((metalzone.ns :ip metalzone)
 			 (vampire.ns :ip vampire))
-      #-subnet/fretwank ((boyle.ns :ip boyle.nsict.org)
+      #-subnet/fretwank ((mythic-beasts-1.ns :ip mythic-ns1)
+			 (mythic-beasts-2.ns :ip mythic-ns2)
 			 (chiark.ns :ip chiark.greenend.org.uk)
 			 (guvnor.ns :ip guvnor.demon))
   ;;
@@ -102,16 +104,13 @@ (defzone distorted.org.uk
   ;;
   ;; Local services.
   (@ :svc www-frontend)
-  ((www ftp wiki git bugs mail)
-   (inet :svc guvnor.demon)
-   (fretwank :svc metalzone))
-  ((db tor i2p rawk vox www-cache)
+  ((www ftp wiki git bugs mail db tor i2p rawk vox www-cache)
    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
   ;;
   ;; Internal services.
-  ((ntp1) (fretwank :svc metalzone))
-  ((wpad ntp news) (fretwank :svc vampire))
+  ((ntp) (fretwank :svc ibanez))
+  ((wpad ntp1 news) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet.
   (fretwank :net fretwank)
@@ -123,13 +122,16 @@ (defzone distorted.org.uk
 	   (iodine :a vampire.iodine))
   (obsidian (fretwank :a obsidian))
   (ibanez (fretwank :a ibanez))
-  (radius (fretwank :a radius))
+  (radius (fretwank :a radius)
+	  (untrusted :a radius.untrusted))
   (roadstar (fretwank :a roadstar))
   (jem (fretwank :a jem))
   (artist (fretwank :a artist))
   (gibson :cname gibson.dhcp)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
+  (marauder :cname marauder.dhcp)
+  (invader :cname invader.dhcp)
   ;;
   ;; Virtual network.
   (virtual :net virtual)