X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/f0209b9cd02f4feaffbefc386b27e86fde4a5922..c4e3b1d56ec942ef529d9cc9f132b39b42230e67:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 7e397e2..52bf180 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -29,29 +29,55 @@ (defzone distorted.org.uk
    :mx mail
    :srv ((:smtp mail)))
 
-  ;; Kerberos.
-  (_kerberos :txt "DISTORTED.ORG.UK")
-  :srv (((:kerberos :protocol :udp) krb)
-	((:kerberos-master :protocol :udp :port 88) krb)
-	(:kerberos-adm krb)
-	((:kpasswd :protocol :udp) krb))
-
-  ;; Anycast services.  (Currently not implemented.)
-  (dns0 (unsafe :svc radius.unsafe)
-	(any :a dns0.any))
-  (dns1 (unsafe :svc vampire.unsafe)
-	(any :a dns1.any))
-  (ntp0 (unsafe :svc ibanez.unsafe)
-	(any :a ntp0.any))
-  (ntp1 (unsafe :svc vampire.unsafe)
-	(any :a ntp1.any))
-  (www-cache (dmz :svc vampire.dmz)
-	     (unsafe :svc vampire.unsafe)
-	     (any :a www-cache.any))
+  ;; 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))
   (dns :cname dns0)
+
+  (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))
   (ntp :cname ntp0)
+
+  (www-cache (any :a www-cache.any)
+	     (jump :svc telecaster.jump)
+	     (dmz :svc roadstar.dmz)
+	     (unsafe :svc roadstar.unsafe)
+	     (colo :svc telecaster.colo))
   (wpad :cname www-cache)
 
+  (_kerberos :txt "DISTORTED.ORG.UK")
+  (krb0 (any :a krb0.any)
+	(jump :svc precision.jump)
+	(dmz :svc radius.dmz)
+	(unsafe :svc radius.unsafe)
+	(colo :svc precision.colo))
+  (krb1 (any :a krb1.any)
+	(dmz :svc vampire.dmz)
+	(unsafe :svc vampire.unsafe))
+  (krb-master (unsafe :svc radius.unsafe)
+	      (dmz :svc radius.dmz))
+  :srv (((:kerberos :protocol :udp)
+	 krb0
+	 (krb1 :prio 100))
+	((:kerberos-master :protocol :udp :port 88) krb-master)
+	(:kerberos-adm krb-master)
+	((:kpasswd :protocol :udp) krb-master))
+  (krb :cname krb0)
+
   ;; Other services.
   :srv ((:http www)
 	(:ftp ftp))
@@ -68,10 +94,21 @@ (defzone distorted.org.uk
   (evolution (safe :a evolution.safe))
   (evolution :alias evo)
 
+  ;; Colocated services.
+  (irc (colo :svc jazz.colo)
+       (jump :svc jazz.jump))
+  ((git www) (colo :svc stratocaster.colo)
+	     (jump :svc stratocaster.jump))
+  :svc #+view/inside stratocaster.colo
+       #-view/inside stratocaster.jump
+  (cabal :svc stratocaster.colo)
+
   ;; Local services.
-  :svc vampire
-  ((www krb ftp rsync wiki git bugs mail db i2p rawk vox)
-   :svc vampire)
+  (rawk (unsafe :svc artist.unsafe)
+        (dmz :svc artist.dmz))
+  (pifi (vpn :svc orange.vpn)
+	(dmz :svc artist.dmz))
+  ((ftp rsync wiki bugs mail db i2p vox) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
@@ -81,7 +118,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)
@@ -97,7 +134,11 @@ (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))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
@@ -106,8 +147,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)
@@ -132,6 +172,8 @@ (defzone distorted.org.uk
   (vpn :net vpn)
   (crybaby (vpn :a crybaby.vpn))
   (terror (vpn :a terror.vpn))
+  (orange (vpn :a orange.vpn))
+  (mango (vpn :a mango.vpn))
   (iodine :net iodine)
 
   ;; ITS.
@@ -149,7 +191,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.
@@ -182,7 +224,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 --------------------------------------------------