From 17c95de99172c3f365d6a0212da680392ed2e52e Mon Sep 17 00:00:00 2001 Message-Id: <17c95de99172c3f365d6a0212da680392ed2e52e.1715098415.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 9 Dec 2012 17:31:43 +0000 Subject: [PATCH] distorted.lisp, hosts.lisp: Move iodine endpoint to jazz. Organization: Straylight/Edgeware From: Mark Wooding We no longer need the special address, because this is the only DNS server jazz runs. --- distorted.lisp | 12 ++++++------ hosts.lisp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index a59725c..dafe67f 100644 --- 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 dcd4db9..26249f1 100644 --- 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. -- [mdw]