distorted.lisp: Use the proper address for `guvnor' internally.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 3a0a4b0fa4e255412eca2f2d1f74c623651c9aa6..0bf09f21661a478c57abdb8729328532e5dc4b19 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -29,13 +29,6 @@ (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.
   (dns0 (any :a dns0.any)
        (jump :svc precision.jump)
@@ -47,6 +40,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 +50,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 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,20 +94,29 @@ (defzone distorted.org.uk
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc jazz.colo)
-       (jump :svc jazz.jump))
+  ((irc vox) (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) :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 (jump :a jazz.jump))
@@ -138,7 +160,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 +174,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,6 +189,9 @@ (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)))