distorted.lisp: Fix which network ranges are announced.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 3ff1057543b4ad1dc146744c8d9d788a1ecc1494..86c0e3a78cbfcca29b711c5a2c86d3922f1f8aea 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -13,7 +13,7 @@ (setf *default-zone-source* 'radius.distorted.org.uk.)
 ;;; Main zone definition.
 
 (defzone distorted.org.uk
 ;;; Main zone definition.
 
 (defzone distorted.org.uk

-  ;;
+

   ;; Nameservers.
   :ns #+view/inside ((radius.ns :ip radius)
                     (vampire.ns :ip vampire))
   ;; Nameservers.
   :ns #+view/inside ((radius.ns :ip radius)
                     (vampire.ns :ip vampire))


@@ -22,37 +22,67 @@ (defzone distorted.org.uk
                     (mythic-beasts-1.ns :ip mythic-ns1)
                     (mythic-beasts-2.ns :ip mythic-ns2)
                     (chiark.ns :ip chiark.greenend.org.uk))
                     (mythic-beasts-1.ns :ip mythic-ns1)
                     (mythic-beasts-2.ns :ip mythic-ns2)
                     (chiark.ns :ip chiark.greenend.org.uk))

-  ;;
+

   ;; Mail servers.
   ((@ mail lists bugs cryptomail)
    :mx mail
    :srv ((:smtp mail)))
   ;; Mail servers.
   ((@ mail lists bugs cryptomail)
    :mx mail
    :srv ((:smtp mail)))

-  ;;
+
+  ;; Kerberos.
+  (_kerberos :txt "DISTORTED.ORG.UK")
+  :srv (((:kerberos :protocol :udp) krb)
+       ((:kerberos-master :protocol :udp :port 88) krb)
+       (:kerberos-adm krb)
+       ((:kpasswd :protocol :udp) krb))
+

   ;; Other services.
   :srv ((:http www)
        (:ftp ftp))
   ;; Other services.
   :srv ((:http www)
        (:ftp ftp))

-  ;;
+

   ;; Entry is via little router box.
   (dmz :net dmz)
   (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
   ;; 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))
   (gate (dmz :a gate.dmz))
   (nat (dmz :a nat.dmz))

-  ;;
+

   ;; Wireless gateway.
   (wireless :net wireless)
   (evolution (untrusted :a evolution.untrusted))
   ;; Wireless gateway.
   (wireless :net wireless)
   (evolution (untrusted :a evolution.untrusted))

-  ;;
+

   ;; Local services.
   :svc vampire
   ;; Local services.
   :svc vampire

-  ((www ftp wiki git bugs mail db tor i2p rawk vox www-cache)
+  ((www krb ftp rsync wiki git bugs mail db i2p rawk vox www-cache)

    :svc vampire)
    :svc vampire)

-  ;;
+

   ;; 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
+           #-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 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)


@@ -69,25 +99,25 @@ (defzone distorted.org.uk
        (dmz :a jem.dmz))
   (artist (unsafe :a artist.unsafe)
          (dmz :a artist.dmz))
        (dmz :a jem.dmz))
   (artist (unsafe :a artist.unsafe)
          (dmz :a artist.dmz))

-  ;;
+

   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)

-  ;;
+

   ;; Virtual network.
   (virtual :net virtual)
   (crybaby (virtual :a crybaby.virtual))
   (terror (virtual :a terror.virtual))
   (iodine :net iodine)
   ;; Virtual network.
   (virtual :net virtual)
   (crybaby (virtual :a crybaby.virtual))
   (terror (virtual :a terror.virtual))
   (iodine :net iodine)

-  ;;
+

   ;; ITS.
   (its :net its)
   (gw (its :a gw.its))
   (mz (its :a mz.its))
   ;; ITS.
   (its :net its)
   (gw (its :a gw.its))
   (mz (its :a mz.its))

-  ;;
+

   ;; Delegations.
   #+view/inside (dhcp :ns (radius.ns vampire.ns))
   (io :ns ((ns.io :ip vampire))))
   ;; Delegations.
   #+view/inside (dhcp :ns (radius.ns vampire.ns))
   (io :ns ((ns.io :ip vampire))))


@@ -100,30 +130,21 @@ (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))))
-
-(defrevzone untrusted
-  :ns ((radius.ns :ip radius)
-       (vampire.ns :ip vampire))
-  :reverse untrusted)
+  :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 dmz
   :ns ((radius.ns :ip radius)
        (vampire.ns :ip vampire))
   :reverse dmz)
 

-(defzone dhcp.distorted.org.uk
+(defrevzone jump

   :ns ((radius.ns :ip radius)
        (vampire.ns :ip vampire))
   :ns ((radius.ns :ip radius)
        (vampire.ns :ip vampire))

-  :net dhcp)
+  :reverse jump)

 
 (defzone io.distorted.org.uk
   :ns ((ns :ip vampire))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))
 
 
 (defzone io.distorted.org.uk
   :ns ((ns :ip vampire))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))
 

-(defzone dhcp.199.29.172.in-addr.arpa
-  :ns ((radius.ns :ip radius)
-       (vampire.ns :ip vampire)))
-

 ;;;----- That's all, folks --------------------------------------------------
 ;;;----- That's all, folks --------------------------------------------------