X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/5d4e9b34b20c100bcdfe24fde9d835cb4fdb1245..0262908f24a75ed46335ec5741327c093cb271cc:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 90f5d88..d9691da 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -35,6 +35,22 @@
 	(: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))
@@ -48,21 +64,24 @@
 
   ;; Wireless gateway.
   (wireless :net wireless)
-  (evolution (untrusted :a evolution.untrusted))
+  (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
 	    #-view/inside anon.dmz)
 
+  ;; Fancy connectivity.
+  (iodine (dmz :a iodine.dmz))
+
   ;; Colocated hosts.
   (colo :net colo)
   (jump :net jump)
@@ -85,13 +104,14 @@
   (untrusted :net untrusted)
   (vampire (unsafe :a vampire.unsafe)
 	   (dmz :a vampire.dmz)
+	   (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)
 	  (dmz :a radius.dmz)
+	  (safe :a radius.safe)
 	  (untrusted :a radius.untrusted))
   (roadstar (unsafe :a roadstar.unsafe)
 	    (dmz :a roadstar.dmz))
@@ -108,9 +128,9 @@
   (invader :cname invader.dhcp)
 
   ;; Virtual network.
-  (virtual :net virtual)
-  (crybaby (virtual :a crybaby.virtual))
-  (terror (virtual :a terror.virtual))
+  (vpn :net vpn)
+  (crybaby (vpn :a crybaby.vpn))
+  (terror (vpn :a terror.vpn))
   (iodine :net iodine)
 
   ;; ITS.
@@ -118,9 +138,14 @@
   (gw (its :a gw.its))
   (mz (its :a mz.its))
 
+  ;; Strange things.
+  (blackhole (jump :a blackhole.jump))
+
   ;; Delegations.
-  #+view/inside (dhcp :ns (radius.ns vampire.ns))
-  (io :ns ((ns.io :ip vampire))))
+  (dhcp :ns (radius.ns vampire.ns))
+  (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+	       (vampire.ns.dnserr :ip vampire.dmz)))
+  (io :ns ((ns.io :ip iodine.dmz))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -128,7 +153,11 @@
 (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)))