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

diff --git a/distorted.lisp b/distorted.lisp
index 02dd2e3..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))
@@ -42,33 +58,57 @@ (defzone distorted.org.uk
   ;; Entry is via little router box.
   (dmz :net dmz)
   (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
+  (anon (dmz :a anon.dmz))
   (gate (dmz :a gate.dmz))
   (nat (dmz :a nat.dmz))
 
   ;; 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 tor 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) :svc vampire.unsafe)
+  #+view/inside ((news lpr) :svc vampire.unsafe)
+
+  ;; Anonymity services.
+  (tor :svc #+view/inside vampire.unsafe
+	    #-view/inside anon.dmz)
+
+  ;; Colocated hosts.
+  (colo :net colo)
+  (jump :net jump)
+  (fender ;(colo :a fender.colo)
+	  (jump :a fender.jump))
+  (precision ;(colo :a precision.colo)
+	     (jump :a precision.jump))
+  (telecaster ;(colo :a telecaster.colo)
+	      (jump :a telecaster.jump))
+  (telecaster :alias tele)
+  (stratocaster ;(colo :a stratocaster.colo)
+		(jump :a stratocaster.jump))
+  (stratocaster :alias strat)
+  (jazz ;(colo :a jazz.colo)
+	(jump :a jazz.jump))
 
   ;; Wired ethernet.
-  (wired :net wired)
+  (unsafe :net unsafe)
+  (safe :net safe)
+  (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))
@@ -85,9 +125,9 @@ (defzone distorted.org.uk
   (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.
@@ -96,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))))
 
 ;;;--------------------------------------------------------------------------
@@ -105,16 +145,25 @@ (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
-     (dhcp (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+  :cidr-delegation
+  (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
 
 (defrevzone dmz
   :ns ((radius.ns :ip radius)
        (vampire.ns :ip vampire))
   :reverse dmz)
 
+(defrevzone jump
+  :ns ((radius.ns :ip radius)
+       (vampire.ns :ip vampire))
+  :reverse jump)
+
 (defzone io.distorted.org.uk
   :ns ((ns :ip vampire))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))