distorted.lisp: New zone for dynamic DNS service.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 253c560f5d59f8ae3058ad99e27cf0faee3272c8..acf66c62290295c338e9e791e1207283d401054e 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -1,154 +1,233 @@
 ;;; Zone file for distorted.org.uk
 
 ;;; Zone file for distorted.org.uk
 

-(load "hosts" :verbose nil)
-
-;;;--------------------------------------------------------------------------
-;;; Network allocations
-;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
-
-(defnet distorted.org.uk 172.29.198.0/23
-  (untrusted 256
-    (wireless 64))
-  (trusted 256
-    (fretwank 128
-      (unsafe 32)
-      (dhcp 32)
-      (safe 32))
-    (virtual 32)
-    (its 4)))
-
-;;;--------------------------------------------------------------------------
-;;; Host allocations
-
-;; External addresses.
-(defhost guvnor.demon 80.177.3.76)
-
-;; Unsafe network.
-(defhost guvnor (unsafe 1))
-(defhost metalzone (unsafe 2))
-(defhost evolution (unsafe 3))
-(defhost vampire (unsafe 4))
-
-;; Safe network.
-(defhost tubescreamer (safe 1))
-(defhost obsidian (safe 2))
-
-;; Wireless network.
-(defhost evolution.wireless (wireless 1))
-
-;; Virtual private network.
-(defhost fuzzface (virtual 1))
-
-;; Special network for ITS.
-;; It doesn't understand point-to-point links, so we need a little net.
-(defhost gw (its 1))
-(defhost mz (its 2))
+(load "hosts.lisp" :verbose nil)

 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 

-(preferred-subnet-case
-  (fretwank
-   (setf *default-zone-source* 'metalzone.distorted.org.uk.)
-   (defhost www-frontend metalzone))
-  (t
-   (setf *default-zone-source* 'guvnor.distorted.org.uk.)
-   (defhost www-frontend guvnor.demon)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)

 
 ;;;--------------------------------------------------------------------------
 ;;; Main zone definition.
 
 (defzone distorted.org.uk
 
 ;;;--------------------------------------------------------------------------
 ;;; Main zone definition.
 
 (defzone distorted.org.uk

-  ;;
-  ;; Nameservers
-  :ns #+subnet/fretwank ((metalzone.ns :ip metalzone)
-                        (vampire.ns :ip vampire))
-      #-subnet/fretwank ((boyle.ns :ip boyle.nsict.org)
-                        (chiark.ns :ip chiark.greenend.org.uk)
-                        (guvnor.ns :ip guvnor.demon))
-  ;;
-  ;; Mail servers
+
+  ;; Nameservers.
+  :ns #+view/inside ((radius.ns :ip radius)
+                    (precision.ns :ip precision)
+                    (vampire.ns :ip vampire))
+      #-view/inside ((radius.ns :ip radius)
+                    (precision.ns :ip precision)
+                    (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 lists bugs cryptomail)
    :mx mail
    :srv ((:smtp mail)))

-  ;;
-  ;; Other services
+
+  ;; Anycast services.
+  (dns0 (any :a dns0.any)
+       (jump :svc precision.jump)
+       (dmz :svc radius.dmz)
+       (unsafe :svc radius.unsafe)
+       (colo :svc precision.colo))
+  (dns1 (any :a dns1.any)
+       (jump :svc telecaster.jump)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe)
+       (colo :svc telecaster.colo))
+  (dns :cname dns0)
+
+  (ntp0 (any :a ntp0.any)
+       (jump :svc fender.jump)
+       (dmz :svc ibanez.dmz)
+       (unsafe :svc ibanez.unsafe)
+       (colo :svc fender.colo))
+  (ntp1 (any :a ntp1.any)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe))
+  (ntp :cname ntp0)
+
+  (www-cache (any :a www-cache.any)
+            (jump :svc telecaster.jump)
+            (dmz :svc roadstar.dmz)
+            (unsafe :svc roadstar.unsafe)
+            (colo :svc telecaster.colo))
+  (wpad :cname www-cache)
+
+  (_kerberos :txt "DISTORTED.ORG.UK")
+  (krb0 (any :a krb0.any)
+       (jump :svc precision.jump)
+       (dmz :svc radius.dmz)
+       (unsafe :svc radius.unsafe)
+       (colo :svc precision.colo))
+  (krb1 (any :a krb1.any)
+       (dmz :svc vampire.dmz)
+       (unsafe :svc vampire.unsafe))
+  (krb-master (unsafe :svc radius.unsafe)
+             (dmz :svc radius.dmz))
+  :srv (((:kerberos :protocol :udp)
+        krb0
+        (krb1 :prio 100))
+       ((:kerberos-master :protocol :udp :port 88) krb-master)
+       (:kerberos-adm krb-master)
+       ((:kpasswd :protocol :udp) krb-master))
+  (krb :cname krb0)
+
+  ;; Other services.

   :srv ((:http www)
        (:ftp ftp))
   :srv ((:http www)
        (:ftp ftp))

-  ;;
-  ;; Colocated services
-  ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
-  ;;
-  ;; Entry is via little port-forwarding box
-  (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
-  ;;
-  ;; Wireless gateway
+
+  ;; 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))
+
+  ;; Wireless gateway.

   (wireless :net wireless)
   (wireless :net wireless)

-  (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
-  ;;
-  ;; Local services
-  (@ :svc www-frontend)
-  ((www ftp wiki git bugs mail rawk)
-   (inet :svc guvnor.demon)
-   (fretwank :svc metalzone))
-  ((db)
-   (inet :svc guvnor.demon)
-   (fretwank :svc vampire))
-  (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
-  ;;
-  ;; Internal services
-  ((news ntp) (fretwank :svc metalzone))
-  ((www-cache wpad ntp1) (fretwank :svc vampire))
-  ;;
-  ;; Wired ethernet
-  (fretwank :net fretwank)
-  (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
-  (vampire (fretwank :a vampire))
-  (tubescreamer (fretwank :a tubescreamer))
-  (obsidian (fretwank :a obsidian))
-  ;;
-  ;; Virtual network
-  (virtual :net virtual)
-  (fuzzface (virtual :a fuzzface))
-  ;;
-  ;; ITS
+  (evolution (safe :a evolution.safe))
+  (evolution :alias evo)
+
+  ;; Colocated services.
+  (irc (colo :svc jazz.colo)
+       (jump :svc jazz.jump))
+  ((git www) (colo :svc stratocaster.colo)
+            (jump :svc stratocaster.jump))
+  :svc #+view/inside stratocaster.colo
+       #-view/inside stratocaster.jump
+  (cabal :svc stratocaster.colo)
+
+  ;; Local services.
+  (rawk (unsafe :svc artist.unsafe)
+        (dmz :svc artist.dmz))
+  (pifi (vpn :svc orange.vpn)
+       (dmz :svc artist.dmz))
+  ((ftp rsync wiki bugs mail db i2p vox) :svc vampire)
+
+  ;; Internal services.
+  #+view/inside ((news lpr) :svc vampire.unsafe)
+
+  ;; Anonymity services.
+  (tor :svc #+view/inside vampire.unsafe
+           #-view/inside anon.dmz)
+
+  ;; Fancy connectivity.
+  (iodine (jump :a jazz.jump))
+
+  ;; 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)
+       (iodine :a jazz.iodine))
+
+  ;; Nicko's server.
+  (richmond (jump :a richmond.jump))
+
+  ;; Wired ethernet.
+  (unsafe :net unsafe)
+  (safe :net safe)
+  (untrusted :net untrusted)
+  (vampire (unsafe :a vampire.unsafe)
+          (dmz :a vampire.dmz)
+          (safe :a vampire.safe)
+          (untrusted :a vampire.untrusted))
+  (ibanez (unsafe :a ibanez.unsafe)
+         (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))
+  (jem (unsafe :a jem.unsafe)
+       (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)
+
+  ;; Virtual network.
+  (vpn :net vpn)
+  (crybaby (vpn :a crybaby.vpn))
+  (terror (vpn :a terror.vpn))
+  (orange (vpn :a orange.vpn))
+  (mango (vpn :a mango.vpn))
+  (iodine :net iodine)
+
+  ;; ITS.

   (its :net its)
   (its :net its)

-  (gw (its :a gw))
-  (mz (its :a mz))
-  ;;
-  ;; Delegations
-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns)))
+  (gw (its :a gw.its))
+  (mz (its :a mz.its))
+
+  ;; Strange things.
+  (blackhole (jump :a blackhole.jump))
+
+  ;; Delegations.
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+            (precision.ns.dhcp :ip precision)
+            (vampire.ns.dhcp :ip vampire)))
+  (dyn :ns ((radius.ns.dyn :ip radius)
+           (precision.ns.dyn :ip precision)
+           (vampire.ns.dyn :ip vampire)))
+  (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+              (precision.ns.dnserr :ip precision.jump)
+              (vampire.ns.dnserr :ip vampire.dmz)))
+  (io :ns ((ns.io :ip jazz.jump))))

 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 (defrevzone trusted
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 (defrevzone trusted

-  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  :reverse trusted
-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
-  #+subnet/fretwank (@ :cidr-delegation
-                      (dhcp
-                       (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
-
-(defrevzone untrusted
-  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  #+subnet/fretwank (wireless :ns (metalzone.ns vampire.ns))
-  #+subnet/fretwank (@ :cidr-delegation
-                      (wireless
-                       (wireless
-                        198.29.172.wireless.198.29.172.in-addr.arpa))))
-
-(defzone dhcp.distorted.org.uk
-  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  :net dhcp)
-
-(defzone dhcp.199.29.172.in-addr.arpa
-  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire)))
-
-(defzone wireless.198.29.172.in-addr.arpa
-  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  :reverse ((wireless :bytes 4)))
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (vampire.ns :ip vampire))
+  :reverse unsafe
+  :reverse vpn
+  :reverse colo
+  :reverse its
+  :reverse any
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+            (precision.ns.dhcp :ip precision)
+            (vampire.ns.dhcp :ip vampire)))
+  :cidr-delegation
+  (trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
+
+(defrevzone dmz
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (vampire.ns :ip vampire))
+  :reverse dmz)
+
+(defrevzone jump
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (vampire.ns :ip vampire))
+  :reverse jump)
+
+(defzone io.distorted.org.uk
+  :ns ((ns :ip jazz.jump))
+  (about :txt "Fake zone used for IP-over-DNS tunnelling."))

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