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

diff --git a/distorted.lisp b/distorted.lisp
index 90f5d88..3ca4392 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -48,11 +48,13 @@
 
   ;; 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 git-master
+    bugs mail db i2p rawk vox www-cache)
    :svc vampire)
 
   ;; Internal services.
@@ -85,6 +87,7 @@
   (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))
@@ -92,6 +95,7 @@
 	  (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 +112,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.
@@ -128,7 +132,10 @@
 (defrevzone trusted
   :ns ((radius.ns :ip radius)
        (vampire.ns :ip vampire))
-  :reverse trusted
+  :reverse unsafe
+  :reverse vpn
+  :reverse colo
+  :reverse its
   (dhcp :ns (radius.ns vampire.ns))
   :cidr-delegation
   (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))