distorted.lisp, hosts.lisp: Publish addresses for anycast services.

diff --git a/distorted.lisp b/distorted.lisp
index 184be4324d84c549c12f3baa8f377b9ed6550f21..a39ac912910f5702dec8158bd537d38b1afda220 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -35,6 +35,22 @@ (defzone distorted.org.uk
        (:kerberos-adm krb)
        ((:kpasswd :protocol :udp) krb))
 
        (:kerberos-adm krb)
        ((:kpasswd :protocol :udp) krb))
 

+  ;; Anycast services.  (Currently not implemented.)
+  (dns0 (inside :svc radius.unsafe)
+       (any :a dns0.any))
+  (dns1 (inside :svc vampire.unsafe)
+       (any :a dns1.any))
+  (ntp0 (inside :svc ibanez.unsafe)
+       (any :a ntp0.any))
+  (ntp1 (inside :svc vampire.unsafe)
+       (any :a ntp1.any))
+  (www-cache (dmz :svc vampire.dmz)
+            (inside :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))
   ;; Other services.
   :srv ((:http www)
        (:ftp ftp))


@@ -53,13 +69,11 @@ (defzone distorted.org.uk
 
   ;; Local services.
   :svc vampire
 
   ;; 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.
    :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
 
   ;; Anonymity services.
   (tor :svc #+view/inside vampire.unsafe


@@ -135,6 +149,7 @@ (defrevzone trusted
   :reverse vpn
   :reverse colo
   :reverse its
   :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)))
   (dhcp :ns (radius.ns vampire.ns))
   :cidr-delegation
   (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))

diff --git a/hosts.lisp b/hosts.lisp
index cee2a51c99903c325af06139a731e732a9dddd46..b7fc5e5bab750b47a23089f1b2a6028aafa7f58b 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -95,6 +95,13 @@ (defhost telecaster.colo (colo 3))
 (defhost stratocaster.colo (colo 4))
 (defhost jazz.colo (colo 5))
 
 (defhost stratocaster.colo (colo 4))
 (defhost jazz.colo (colo 5))
 

+;; Anycast addresses for services.
+(defhost dns0.any (any 0))
+(defhost dns1.any (any 1))
+(defhost ntp0.any (any 2))
+(defhost ntp1.any (any 3))
+(defhost www-cache.any (any 4))
+

 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.