distorted.lisp: Fix which network ranges are announced.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8325a9232825775446a184767db83e16af7a81b1..86c0e3a78cbfcca29b711c5a2c86d3922f1f8aea 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -57,14 +57,32 @@ (defzone distorted.org.uk
 
   ;; Internal services.
   #+view/inside ((ntp) :svc ibanez.unsafe)
-  #+view/inside ((wpad ntp1 news) :svc vampire.unsafe)
+  #+view/inside ((wpad ntp1 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)
           (untrusted :a vampire.untrusted)
@@ -112,14 +130,19 @@ (defrevzone trusted
        (vampire.ns :ip vampire))
   :reverse trusted
   (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."))