Makefile, distorted.lisp: Deploy anycast services.

diff --git a/Makefile b/Makefile
index 8c65965..3ca76cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ ZONESETS              += distorted
 
 distorted_VIEWS                 = inside outside
 distorted_outside_NETS  = dmz jump
-distorted_inside_NETS   = unsafe colo
+distorted_inside_NETS   = any unsafe colo
 
 distorted_all_ZONES    += distorted.org.uk
 distorted_all_ZONES    += 199.29.172.in-addr.arpa

diff --git a/distorted.lisp b/distorted.lisp
index 6e064d9..c7fa483 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -36,18 +36,30 @@
        (: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)
+  ;; Anycast services.
+  (dns0 (any :a dns0.any)
+       (jump :svc precision.jump)
+       (dmz :svc radius.dmz)
+       (unsafe :svc radius.unsafe)
+       (colo :svc precision.colo))
+  (dns1 (any :a dns1.any)
+       (jump :svc telecaster.jump)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe)
+       (colo :svc telecaster.colo))
+  (ntp0 (any :a ntp0.any)
+       (jump :svc fender.jump)
+       (dmz :svc ibanez.dmz)
+       (unsafe :svc ibanez.unsafe)
+       (colo :svc fender.colo))
+  (ntp1 (any :a ntp1.any)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe))
+  (www-cache (any :a www-cache.any)
+            (jump :svc telecaster.jump)
+            (dmz :svc vampire.dmz)
             (unsafe :svc vampire.unsafe)
-            (any :a www-cache.any))
+            (colo :svc telecaster.colo))
   (dns :cname dns0)
   (ntp :cname ntp0)
   (wpad :cname www-cache)