distorted.lisp: Fix which network ranges are announced.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8327c8254ac8b4c2beadbce711a99efac404eabe..86c0e3a78cbfcca29b711c5a2c86d3922f1f8aea 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -57,7 +57,7 @@ (defzone distorted.org.uk
 
   ;; Internal services.
   #+view/inside ((ntp) :svc ibanez.unsafe)
 
   ;; 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
 
   ;; Anonymity services.
   (tor :svc #+view/inside vampire.unsafe


@@ -80,7 +80,9 @@ (defzone distorted.org.uk
        (jump :a jazz.jump))
 
   ;; Wired ethernet.
        (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)
   (vampire (unsafe :a vampire.unsafe)
           (dmz :a vampire.dmz)
           (untrusted :a vampire.untrusted)


@@ -128,8 +130,8 @@ (defrevzone trusted
        (vampire.ns :ip vampire))
   :reverse trusted
   (dhcp :ns (radius.ns vampire.ns))
        (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)
 
 (defrevzone dmz
   :ns ((radius.ns :ip radius)