distorted.lisp, hosts.lisp: Move iodine endpoint to jazz.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c7fa483497b322089cec1334b9c48aa4209f4dd7..dafe67f21798fdd885029c5da270c1b43328171b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -57,8 +57,8 @@ (defzone distorted.org.uk
        (unsafe :svc vampire.unsafe))
   (www-cache (any :a www-cache.any)
             (jump :svc telecaster.jump)
-            (dmz :svc vampire.dmz)
-            (unsafe :svc vampire.unsafe)
+            (dmz :svc roadstar.dmz)
+            (unsafe :svc roadstar.unsafe)
             (colo :svc telecaster.colo))
   (dns :cname dns0)
   (ntp :cname ntp0)
@@ -97,7 +97,7 @@ (defzone distorted.org.uk
            #-view/inside anon.dmz)
 
   ;; Fancy connectivity.
-  (iodine (dmz :a iodine.dmz))
+  (iodine (jump :a jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
@@ -113,7 +113,8 @@ (defzone distorted.org.uk
                (jump :a stratocaster.jump))
   (stratocaster :alias strat)
   (jazz (colo :a jazz.colo)
-       (jump :a jazz.jump))
+       (jump :a jazz.jump)
+       (iodine :a jazz.iodine))
 
   ;; Nicko's server.
   (richmond (jump :a richmond.jump))
@@ -125,8 +126,7 @@ (defzone distorted.org.uk
   (vampire (unsafe :a vampire.unsafe)
           (dmz :a vampire.dmz)
           (safe :a vampire.safe)
-          (untrusted :a vampire.untrusted)
-          (iodine :a vampire.iodine))
+          (untrusted :a vampire.untrusted))
   (ibanez (unsafe :a ibanez.unsafe)
          (dmz :a ibanez.dmz))
   (radius (unsafe :a radius.unsafe)
@@ -168,7 +168,7 @@ (defzone distorted.org.uk
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
               (precision.ns.dnserr :ip precision.jump)
               (vampire.ns.dnserr :ip vampire.dmz)))
-  (io :ns ((ns.io :ip iodine.dmz))))
+  (io :ns ((ns.io :ip jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -201,7 +201,7 @@ (defrevzone jump
   :reverse jump)
 
 (defzone io.distorted.org.uk
-  :ns ((ns :ip vampire))
+  :ns ((ns :ip jazz.jump))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))
 
 ;;;----- That's all, folks --------------------------------------------------