hosts.lisp, distorted.lisp: Fix records for `richmond'.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 51bfe024edc0f8275aa611ef8b1d05b37d5d205b..967401d33e11d29b00e4e8f2f8f8b955804035d0 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -16,7 +16,7 @@ (defzoneparse :anycast (name data rec :prefix prefix :zname zname)
     ;; IPv6 anycast addresses are globally routable, while IPv4 ones aren't.
     (if (zone-preferred-subnet-p (car any-provider))
        (zone-set-address #'rec (cdr any-provider) :make-ptr-p t)
-       (dolist (addr (host-addrs (host-parse (cdr any-provider))))
+       (do-host (addr (cdr any-provider))
          (let ((family (ipaddr-family addr)))
            (if (member family *anycast-routable-families*)
                (zone-set-address #'rec addr
@@ -47,9 +47,11 @@ (defzone distorted.org.uk
   ;; Nameservers.
   :ns #+view/inside ((radius.ns :ip radius)
                     (precision.ns :ip precision)
+                    (telecaster.ns :ip telecaster)
                     (vampire.ns :ip vampire))
       #-view/inside ((radius.ns :ip radius)
                     (precision.ns :ip precision)
+                    (telecaster.ns :ip telecaster)
                     (mythic-beasts-1.ns :ip mythic-ns1)
                     (mythic-beasts-2.ns :ip mythic-ns2)
                     (chiark.ns :ip chiark.greenend.org.uk))
@@ -138,8 +140,8 @@ (defzone distorted.org.uk
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")
-  ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
-           (jump :svc telecaster.jump :sshfp "telecaster"))
+  ((db ftp dyndns) (colo :svc telecaster.colo :sshfp "telecaster")
+                  (jump :svc telecaster.jump :sshfp "telecaster"))
 
   ;; Local services.
   ((rawk pifi) (unsafe :svc artist.unsafe)
@@ -182,7 +184,7 @@ (defzone distorted.org.uk
   (jaguar (jump :addr jaguar.jump))
 
   ;; Nicko's server.
-  (richmond (jump :addr richmond.jump))
+  (richmond (jump :svc richmond.jump))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
@@ -231,21 +233,34 @@ (defzone distorted.org.uk
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)
             (precision.ns.dhcp :ip precision)
+            (telecaster.ns.dhcp :ip telecaster)
             (vampire.ns.dhcp :ip vampire)))
   (dyn :ns ((radius.ns.dyn :ip radius)
            (precision.ns.dyn :ip precision)
+           (telecaster.ns.dyn :ip telecaster)
            (vampire.ns.dyn :ip vampire)))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
               (precision.ns.dnserr :ip precision.jump)
+              (telecaster.ns.dnserr :ip telecaster)
               (vampire.ns.dnserr :ip vampire.dmz)))
   (io :ns ((ns.io :ip jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
+(defzone dhcp.distorted.org.uk
+  (gibson :addr gibson.unsafe)
+  (lespaul :addr lespaul.safe)
+  (invader :addr invader.safe)
+  (marauder :addr marauder.safe))
+
+(defzone nicko.org
+  (richmond :addr richmond.jump))
+
 (defrevzone trusted
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse unsafe
   :reverse vpn
@@ -254,30 +269,35 @@ (defrevzone trusted
   :reverse any
   (dhcp :ns (radius.distorted.org.uk.
             precision.distorted.org.uk.
+            telecaster.distorted.org.uk.
             vampire.distorted.org.uk.))
   :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
 (defrevzone dmz
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse dmz)
 
 (defrevzone jump
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse jump)
 
 (defrevzone distorted.org.uk-he
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse distorted.org.uk-he)
 
 (defrevzone distorted.org.uk-jump
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
        vampire.distorted.org.uk.)
   :reverse distorted.org.uk-jump)