X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/aef7892ba4aa9ba78d761b2943d5df76f8bbd2d1..9b7e40695ec633ee206dd608a3a7e0e410e5f7c8:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index b2118a4..61f2267 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -122,13 +122,12 @@ (defzone distorted.org.uk
 
   ;; Entry is via little router box.
   (dmz :net dmz)
-  (guvnor (dmz :a guvnor.dmz))
-  (gate (dmz :a gate.dmz))
-  (nat (dmz :a nat.dmz))
+  (guvnor (dmz :addr guvnor.dmz))
+  (nat (dmz :addr nat.dmz))
 
   ;; Wireless gateway.
   (wireless :net wireless)
-  (evolution (safe :a evolution.safe))
+  (evolution (safe :addr evolution.safe))
   (evolution :alias evo)
 
   ;; Colocated services.
@@ -155,56 +154,57 @@ (defzone distorted.org.uk
   ;; Anonymity services.
   (anon (colo :svc jazz.colo)
 	(unsafe :svc vampire.unsafe)
-	(jump :a anon.jump)
-	(dmz :a anon.dmz))
+	(jump :addr anon.jump)
+	(dmz :addr anon.dmz))
 
   ;; Fancy connectivity.
-  (iodine (jump :a jazz.jump))
+  (iodine (jump :addr jazz.jump))
 
   ;; Colocated hosts.
   (colo :net colo)
   (jump :net jump)
-  (fender (colo :a fender.colo :sshfp "fender")
-	  (jump :a fender.jump :sshfp "fender"))
-  (precision (colo :a precision.colo :sshfp "precision")
-	     (jump :a precision.jump :sshfp "precision"))
-  (telecaster (colo :a telecaster.colo :sshfp "telecaster")
-	      (jump :a telecaster.jump :sshfp "telecaster"))
+  (gate (jump :addr gate.jump :sshfp "precision"))
+  (fender (colo :addr fender.colo :sshfp "fender")
+	  (jump :addr fender.jump :sshfp "fender"))
+  (precision (colo :addr precision.colo :sshfp "precision")
+	     (jump :addr precision.jump :sshfp "precision"))
+  (telecaster (colo :addr telecaster.colo :sshfp "telecaster")
+	      (jump :addr telecaster.jump :sshfp "telecaster"))
   (telecaster :alias tele)
-  (stratocaster (colo :a stratocaster.colo :sshfp "stratocaster")
-		(jump :a stratocaster.jump :sshfp "stratocaster"))
+  (stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
+		(jump :addr stratocaster.jump :sshfp "stratocaster"))
   (stratocaster :alias strat)
-  (jazz (colo :a jazz.colo :sshfp "jazz")
-	(jump :a jazz.jump :sshfp "jazz")
-	(iodine :a jazz.iodine :sshfp "jazz"))
+  (jazz (colo :addr jazz.colo :sshfp "jazz")
+	(jump :addr jazz.jump :sshfp "jazz")
+	(iodine :addr jazz.iodine :sshfp "jazz"))
 
   ;; Media server (on loan to Good Technology HSTG).
-  (jaguar (jump :a jaguar.jump))
+  (jaguar (jump :addr jaguar.jump))
 
   ;; Nicko's server.
-  (richmond (jump :a richmond.jump))
+  (richmond (jump :addr richmond.jump))
 
   ;; Wired ethernet.
   (unsafe :net unsafe)
   (safe :net safe)
   (untrusted :net untrusted)
-  (vampire (unsafe :a vampire.unsafe :sshfp "vampire")
-	   (dmz :a vampire.dmz :sshfp "vampire")
-	   (safe :a vampire.safe :sshfp "vampire")
-	   (untrusted :a vampire.untrusted :sshfp "vampire"))
-  (ibanez (unsafe :a ibanez.unsafe :sshfp "ibanez")
-	  (dmz :a ibanez.dmz :sshfp "ibanez"))
-  (radius (unsafe :a radius.unsafe :sshfp "radius")
-	  (dmz :a radius.dmz :sshfp "radius")
-	  (safe :a radius.safe :sshfp "radius")
-	  (untrusted :a radius.untrusted :sshfp "radius"))
-  (roadstar (unsafe :a roadstar.unsafe :sshfp "roadstar")
-	    (dmz :a roadstar.dmz :sshfp "roadstar"))
-  (jem (unsafe :a jem.unsafe :sshfp "jem")
-       (dmz :a jem.dmz :sshfp "jem"))
-  (artist (unsafe :a artist.unsafe :sshfp "artist")
-	  (dmz :a artist.dmz :sshfp "artist")
-	  (untrusted :a artist.untrusted :sshfp "artist"))
+  (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
+	   (dmz :addr vampire.dmz :sshfp "vampire")
+	   (safe :addr vampire.safe :sshfp "vampire")
+	   (untrusted :addr vampire.untrusted :sshfp "vampire"))
+  (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
+	  (dmz :addr ibanez.dmz :sshfp "ibanez"))
+  (radius (unsafe :addr radius.unsafe :sshfp "radius")
+	  (dmz :addr radius.dmz :sshfp "radius")
+	  (safe :addr radius.safe :sshfp "radius")
+	  (untrusted :addr radius.untrusted :sshfp "radius"))
+  (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar")
+	    (dmz :addr roadstar.dmz :sshfp "roadstar"))
+  (jem (unsafe :addr jem.unsafe :sshfp "jem")
+       (dmz :addr jem.dmz :sshfp "jem"))
+  (artist (unsafe :addr artist.unsafe :sshfp "artist")
+	  (dmz :addr artist.dmz :sshfp "artist")
+	  (untrusted :addr artist.untrusted :sshfp "artist"))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
@@ -215,18 +215,18 @@ (defzone distorted.org.uk
 
   ;; Virtual network.
   (vpn :net vpn)
-  (crybaby (vpn :a crybaby.vpn :sshfp "crybaby"))
-  (terror (vpn :a terror.vpn :sshfp "terror"))
-  (orange (vpn :a orange.vpn :sshfp "orange"))
+  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby"))
+  (terror (vpn :addr terror.vpn :sshfp "terror"))
+  (orange (vpn :addr orange.vpn :sshfp "orange"))
   (iodine :net iodine)
 
   ;; ITS.
   (its :net its)
-  (gw (its :a gw.its))
-  (mz (its :a mz.its))
+  (gw (its :addr gw.its))
+  (mz (its :addr mz.its))
 
   ;; Strange things.
-  (blackhole (jump :a blackhole.jump))
+  (blackhole (jump :addr blackhole.jump))
 
   ;; Delegations.
   (dhcp :ns ((radius.ns.dhcp :ip radius)