X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/06f1bb3fe63e3e6fe16d60ba01460fb1f11f4b58..b05ad7e043892e6b8ee0da0f43c0e5dbbac95b42:/distorted.lisp?ds=sidebyside

diff --git a/distorted.lisp b/distorted.lisp
index c7fa483..67c90b0 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -25,16 +25,13 @@ (defzone distorted.org.uk
 		     (chiark.ns :ip chiark.greenend.org.uk))
 
   ;; Mail servers.
-  ((@ mail lists bugs cryptomail)
+  ((@ mail)
    :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))
+  ((lists bugs cryptomail)
+   :ttl 300
+   :mx mail
+   :srv ((:smtp old-mail)))
 
   ;; Anycast services.
   (dns0 (any :a dns0.any)
@@ -47,6 +44,8 @@ (defzone distorted.org.uk
 	(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)
@@ -55,23 +54,41 @@ (defzone distorted.org.uk
   (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 vampire.dmz)
-	     (unsafe :svc vampire.unsafe)
+	     (dmz :svc roadstar.dmz)
+	     (unsafe :svc roadstar.unsafe)
 	     (colo :svc telecaster.colo))
-  (dns :cname dns0)
-  (ntp :cname ntp0)
   (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))
 
   ;; Entry is via little router box.
   (dmz :net dmz)
-  (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
-  (anon (dmz :a anon.dmz))
+  (guvnor (dmz :a guvnor.dmz))
   (gate (dmz :a gate.dmz))
   (nat (dmz :a nat.dmz))
 
@@ -81,23 +98,32 @@ (defzone distorted.org.uk
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc stratocaster.colo)
-       (jump :svc stratocaster.jump))
+  ((irc vox) (colo :svc jazz.colo)
+	     (jump :svc jazz.jump))
+  ((git www mail) (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 (untrusted :cname orange.dhcp)
+	(dmz :svc artist.dmz))
+  ((ftp rsync wiki bugs old-mail db i2p) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
 
   ;; Anonymity services.
-  (tor :svc #+view/inside vampire.unsafe
-	    #-view/inside anon.dmz)
+  (anon (colo :svc jazz.colo)
+        (unsafe :svc vampire.unsafe)
+        (jump :a anon.jump)
+	(dmz :a anon.dmz))
 
   ;; Fancy connectivity.
-  (iodine (dmz :a iodine.dmz))
+  (iodine (jump :a jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
@@ -113,7 +139,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))
+
+  ;; Media server (on loan to Good Technology HSTG).
+  (jaguar (jump :a jaguar.jump))
 
   ;; Nicko's server.
   (richmond (jump :a richmond.jump))
@@ -125,8 +155,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)
@@ -138,7 +167,8 @@ (defzone distorted.org.uk
   (jem (unsafe :a jem.unsafe)
        (dmz :a jem.dmz))
   (artist (unsafe :a artist.unsafe)
-	  (dmz :a artist.dmz))
+	  (dmz :a artist.dmz)
+	  (untrusted :a artist.untrusted))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
@@ -151,6 +181,7 @@ (defzone distorted.org.uk
   (vpn :net vpn)
   (crybaby (vpn :a crybaby.vpn))
   (terror (vpn :a terror.vpn))
+  (orange (vpn :a orange.vpn))
   (iodine :net iodine)
 
   ;; ITS.
@@ -165,10 +196,13 @@ (defzone distorted.org.uk
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (vampire.ns.dhcp :ip vampire)))
+  (dyn :ns ((radius.ns.dyn :ip radius)
+	    (precision.ns.dyn :ip precision)
+	    (vampire.ns.dyn :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 iodine.dmz))))
+  (io :ns ((ns.io :ip jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -201,7 +235,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 --------------------------------------------------