X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/374be89649201837aadadae93320caf3455ce0ed..c0430253dd8fe7e0746bf8ef30a4f1272521baff:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c1025a8..85c9338 100644
--- 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))
@@ -49,15 +65,15 @@ (defzone distorted.org.uk
   ;; Wireless gateway.
   (wireless :net wireless)
   (evolution (safe :a evolution.safe))
+  (evolution :alias evo)
 
   ;; Local services.
   :svc vampire
-  ((www krb ftp rsync wiki git 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
@@ -88,7 +104,6 @@ (defzone distorted.org.uk
 	   (safe :a vampire.safe)
 	   (untrusted :a vampire.untrusted)
 	   (iodine :a vampire.iodine))
-  (obsidian (safe :a obsidian.safe))
   (ibanez (unsafe :a ibanez.unsafe)
 	  (dmz :a ibanez.dmz))
   (radius (unsafe :a radius.unsafe)
@@ -121,7 +136,7 @@ (defzone distorted.org.uk
   (mz (its :a mz.its))
 
   ;; Delegations.
-  #+view/inside (dhcp :ns (radius.ns vampire.ns))
+  (dhcp :ns (radius.ns vampire.ns))
   (io :ns ((ns.io :ip vampire))))
 
 ;;;--------------------------------------------------------------------------
@@ -130,7 +145,11 @@ (defzone distorted.org.uk
 (defrevzone trusted
   :ns ((radius.ns :ip radius)
        (vampire.ns :ip vampire))
-  :reverse trusted
+  :reverse unsafe
+  :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)))