distorted.lisp: Fix subnets for anycast service names.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 184be4324d84c549c12f3baa8f377b9ed6550f21..85c93382a0fc45f502f09ed5a993e2ee8f60bd3f 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -35,6 +35,22 @@ (defzone distorted.org.uk
        (:kerberos-adm krb)
        ((:kpasswd :protocol :udp) krb))
 
+  ;; Anycast services.  (Currently not implemented.)
+  (dns0 (unsafe :svc radius.unsafe)
+       (any :a dns0.any))
+  (dns1 (unsafe :svc vampire.unsafe)
+       (any :a dns1.any))
+  (ntp0 (unsafe :svc ibanez.unsafe)
+       (any :a ntp0.any))
+  (ntp1 (unsafe :svc vampire.unsafe)
+       (any :a ntp1.any))
+  (www-cache (dmz :svc vampire.dmz)
+            (unsafe :svc vampire.unsafe)
+            (any :a www-cache.any))
+  (dns :cname dns0)
+  (ntp :cname ntp0)
+  (wpad :cname www-cache)
+
   ;; Other services.
   :srv ((:http www)
        (:ftp ftp))
@@ -53,13 +69,11 @@ (defzone distorted.org.uk
 
   ;; Local services.
   :svc vampire
-  ((www krb ftp rsync wiki git git-master
-    bugs mail db i2p rawk vox www-cache)
+  ((www krb ftp rsync wiki git bugs mail db i2p rawk vox)
    :svc vampire)
 
   ;; Internal services.
-  #+view/inside ((ntp) :svc ibanez.unsafe)
-  #+view/inside ((wpad ntp1 news lpr) :svc vampire.unsafe)
+  #+view/inside ((news lpr) :svc vampire.unsafe)
 
   ;; Anonymity services.
   (tor :svc #+view/inside vampire.unsafe
@@ -135,6 +149,7 @@ (defrevzone trusted
   :reverse vpn
   :reverse colo
   :reverse its
+  :reverse any
   (dhcp :ns (radius.ns vampire.ns))
   :cidr-delegation
   (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))