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

We no longer need the special address, because this is the only DNS
server jazz runs.

diff --git a/distorted.lisp b/distorted.lisp
index a59725c427c548af78e5ec41d44a3f7db058213a..dafe67f21798fdd885029c5da270c1b43328171b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -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 --------------------------------------------------

diff --git a/hosts.lisp b/hosts.lisp
index dcd4db9da330582794d9aecd2de7c10d923657e5..26249f18e940566594426bbe55a47c84c2fbaf5d 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -47,7 +47,6 @@ (defhost jem.dmz (dmz 4))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))
-(defhost iodine.dmz (dmz 11))
 (defhost anon.dmz (dmz 12))
 (defhost gate.dmz (dmz 13))
 (defhost nat.dmz (dmz 14))
@@ -84,7 +83,7 @@ (defhost crybaby.vpn (vpn 1))
 (defhost terror.vpn (vpn 2))
 
 ;; Iodine network.
-(defhost vampire.iodine (iodine 1))
+(defhost jazz.iodine (iodine 1))
 
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.