X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/17c95de99172c3f365d6a0212da680392ed2e52e..375f178be5882d7bbd825bf8d0aca9d7ba9228dc:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index dafe67f..ea59424 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -29,13 +29,6 @@
    :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.
   (dns0 (any :a dns0.any)
 	(jump :svc precision.jump)
@@ -47,6 +40,8 @@
 	(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,15 +50,34 @@
   (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))
-  (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))
@@ -81,13 +95,16 @@
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc stratocaster.colo)
+  (irc (colo :svc jazz.colo)
+       (jump :svc jazz.jump))
+  (git (colo :svc stratocaster.colo)
        (jump :svc 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))
+  ((@ www ftp rsync wiki bugs mail db i2p vox) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
@@ -151,6 +168,8 @@
   (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.