odin.lisp: Retreat to glueless delegation due to loss of glue records.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index f2559135c53bc1945cee1b4caa02e5c3aba76585..2f247781b35f9066cb0783a0d21012e573c29b0d 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -203,7 +203,9 @@ (defzone distorted.org.uk
                (dmz :alias strat.dmz :abbrev sd))
   (stratocaster (unsafe :addr stratocaster.unsafe :sshfp "stratocaster")
                (dmz :addr stratocaster.dmz :sshfp "stratocaster"))
                (dmz :alias strat.dmz :abbrev sd))
   (stratocaster (unsafe :addr stratocaster.unsafe :sshfp "stratocaster")
                (dmz :addr stratocaster.dmz :sshfp "stratocaster"))

-  (jazz :abbrev z (unsafe :abbrev zu) (dmz :abbrev zd) (vpn :abbrev :zv))
+  (jazz :abbrev z
+       (unsafe :abbrev zu) (dmz :abbrev zd)
+       (vpn :abbrev :zv) (iodine :abbrev z53) (hippo :abbrev zh))

   (jazz (unsafe :addr jazz.unsafe :sshfp "jazz")
        (dmz :addr jazz.dmz :sshfp "jazz")
        (vpn :addr jazz.vpn :sshfp "jazz")
   (jazz (unsafe :addr jazz.unsafe :sshfp "jazz")
        (dmz :addr jazz.dmz :sshfp "jazz")
        (vpn :addr jazz.vpn :sshfp "jazz")


@@ -225,7 +227,7 @@ (defzone distorted.org.uk
 
   ;; Entry is via little router box.
   (dmz :net dmz)
 
   ;; Entry is via little router box.
   (dmz :net dmz)

-  (guvnor (dmz :addr guvnor.dmz))
+  (guvnor (dmz :addr guvnor.dmz :sshfp "radius"))

   (nat (dmz :addr nat.dmz))
 
   ;; Wireless access points.
   (nat (dmz :addr nat.dmz))
 
   ;; Wireless access points.


@@ -288,8 +290,7 @@ (defzone distorted.org.uk
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
          (dmz :addr artist.dmz :sshfp "artist")
          (untrusted :addr artist.untrusted :sshfp "artist"))
   (artist (unsafe :addr artist.unsafe :sshfp "artist")
          (dmz :addr artist.dmz :sshfp "artist")
          (untrusted :addr artist.untrusted :sshfp "artist"))

-  (groove :abbrev gr
-         (vpn :abbrev grv) (unsafe :abbrev gru))
+  (groove :abbrev gr (vpn :abbrev grv) (unsafe :abbrev gru))

   (groove (vpn :addr groove.vpn :sshfp "groove")
          (unsafe :addr groove.unsafe :sshfp "groove"))
 
   (groove (vpn :addr groove.vpn :sshfp "groove")
          (unsafe :addr groove.unsafe :sshfp "groove"))
 


@@ -303,9 +304,10 @@ (defzone distorted.org.uk
 
   ;; Virtual network.
   (vpn :net vpn)
 
   ;; Virtual network.
   (vpn :net vpn)

-  (crybaby :abbrev cb)
+  (crybaby :abbrev cb (vpn :abbrev cbv) (hippo :abbrev cbh))

   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
           (hippo :addr crybaby.hippo :sshfp "crybaby"))
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
           (hippo :addr crybaby.hippo :sshfp "crybaby"))

+  (spirit :abbrev sp (vpn :abbrev spv) (hippo :abbrev sph))

   (spirit (vpn :addr spirit.vpn :sshfp "spirit")
          (hippo :addr spirit.hippo :sshfp "spirit"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (spirit (vpn :addr spirit.vpn :sshfp "spirit")
          (hippo :addr spirit.hippo :sshfp "spirit"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))