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

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 38b674dd7388184f187ec3e01f28b9060aa600b3..dafe67f21798fdd885029c5da270c1b43328171b 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -16,9 +16,10 @@ (defzone distorted.org.uk
 
   ;; Nameservers.
   :ns #+view/inside ((radius.ns :ip radius)
+                    (precision.ns :ip precision)
                     (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
-                    (vampire.ns :ip vampire)
+                    (precision.ns :ip precision)
                     (mythic-beasts-1.ns :ip mythic-ns1)
                     (mythic-beasts-2.ns :ip mythic-ns2)
                     (chiark.ns :ip chiark.greenend.org.uk))
@@ -35,6 +36,34 @@ (defzone distorted.org.uk
        (:kerberos-adm krb)
        ((:kpasswd :protocol :udp) krb))
 
+  ;; Anycast services.
+  (dns0 (any :a dns0.any)
+       (jump :svc precision.jump)
+       (dmz :svc radius.dmz)
+       (unsafe :svc radius.unsafe)
+       (colo :svc precision.colo))
+  (dns1 (any :a dns1.any)
+       (jump :svc telecaster.jump)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe)
+       (colo :svc telecaster.colo))
+  (ntp0 (any :a ntp0.any)
+       (jump :svc fender.jump)
+       (dmz :svc ibanez.dmz)
+       (unsafe :svc ibanez.unsafe)
+       (colo :svc fender.colo))
+  (ntp1 (any :a ntp1.any)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe))
+  (www-cache (any :a www-cache.any)
+            (jump :svc telecaster.jump)
+            (dmz :svc roadstar.dmz)
+            (unsafe :svc roadstar.unsafe)
+            (colo :svc telecaster.colo))
+  (dns :cname dns0)
+  (ntp :cname ntp0)
+  (wpad :cname www-cache)
+
   ;; Other services.
   :srv ((:http www)
        (:ftp ftp))
@@ -51,35 +80,44 @@ (defzone distorted.org.uk
   (evolution (safe :a evolution.safe))
   (evolution :alias evo)
 
+  ;; Colocated services.
+  (irc (colo :svc stratocaster.colo)
+       (jump :svc stratocaster.jump))
+
   ;; Local services.
   :svc vampire
-  ((www krb ftp rsync wiki git git-master
-    bugs mail db i2p rawk vox www-cache)
+  ((www krb ftp rsync wiki git bugs mail db i2p rawk vox)
    :svc vampire)
 
   ;; Internal services.
-  #+view/inside ((ntp) :svc ibanez.unsafe)
-  #+view/inside ((wpad ntp1 news lpr) :svc vampire.unsafe)
+  #+view/inside ((news lpr) :svc vampire.unsafe)
 
   ;; Anonymity services.
   (tor :svc #+view/inside vampire.unsafe
            #-view/inside anon.dmz)
 
+  ;; Fancy connectivity.
+  (iodine (jump :a jazz.jump))
+
   ;; Colocated hosts.
   (colo :net colo)
   (jump :net jump)
-  (fender ;(colo :a fender.colo)
+  (fender (colo :a fender.colo)
          (jump :a fender.jump))
-  (precision ;(colo :a precision.colo)
+  (precision (colo :a precision.colo)
             (jump :a precision.jump))
-  (telecaster ;(colo :a telecaster.colo)
+  (telecaster (colo :a telecaster.colo)
              (jump :a telecaster.jump))
   (telecaster :alias tele)
-  (stratocaster ;(colo :a stratocaster.colo)
+  (stratocaster (colo :a stratocaster.colo)
                (jump :a stratocaster.jump))
   (stratocaster :alias strat)
-  (jazz ;(colo :a jazz.colo)
-       (jump :a jazz.jump))
+  (jazz (colo :a jazz.colo)
+       (jump :a jazz.jump)
+       (iodine :a jazz.iodine))
+
+  ;; Nicko's server.
+  (richmond (jump :a richmond.jump))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
@@ -88,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)
@@ -121,36 +158,50 @@ (defzone distorted.org.uk
   (gw (its :a gw.its))
   (mz (its :a mz.its))
 
+  ;; Strange things.
+  (blackhole (jump :a blackhole.jump))
+
   ;; Delegations.
-  #+view/inside (dhcp :ns (radius.ns vampire.ns))
-  (io :ns ((ns.io :ip vampire))))
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+            (precision.ns.dhcp :ip precision)
+            (vampire.ns.dhcp :ip vampire)))
+  (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 jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 (defrevzone trusted
   :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
        (vampire.ns :ip vampire))
   :reverse unsafe
   :reverse vpn
   :reverse colo
   :reverse its
-  (dhcp :ns (radius.ns vampire.ns))
+  :reverse any
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+            (precision.ns.dhcp :ip precision)
+            (vampire.ns.dhcp :ip vampire)))
   :cidr-delegation
   (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
 
 (defrevzone dmz
   :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
        (vampire.ns :ip vampire))
   :reverse dmz)
 
 (defrevzone jump
   :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
        (vampire.ns :ip vampire))
   :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 --------------------------------------------------