X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/5094e79387d210b2e3e1f7f4d61188116caf4c9a..b4d4c18b8ce51af4017c6072aeebb0641feec74c:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index c0cde05..b9bf87b 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -1,44 +1,72 @@
 ;;; Zone file for distorted.org.uk
 
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
+
+;;;--------------------------------------------------------------------------
+;;; Network allocations
+;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
 
-;; Network allocations
-;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
 (defnet distorted.org.uk 172.29.198.0/23
   (untrusted 256
-    (wireless 64))
+    (wireless 128)
+    (iodine 16))
   (trusted 256
     (fretwank 128
       (unsafe 32)
       (dhcp 32)
       (safe 32))
-    (virtual 32)))
+    (virtual 32)
+    (its 4)))
+
+;;;--------------------------------------------------------------------------
+;;; Host allocations
 
-;; 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 evolution.fretwank (unsafe 3))
 (defhost vampire (unsafe 4))
 
+;; Safe network.
 (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
 
-(defhost evolution.wireless (wireless 1))
+;; Wireless network.
+(defhost vampire.untrusted (untrusted 1))
+(defhost evolution (untrusted 2))
+
+;; Virtual private network.
+(defhost crybaby (virtual 1))
+(defhost terror (virtual 2))
+
+;; Iodine network.
+(defhost vampire.iodine (iodine 1))
 
-(defhost fuzzface (virtual 1))
-(defhost mz (virtual 2))
+;; 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))
+
+;;;--------------------------------------------------------------------------
+;;; 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))
+   (setf *default-zone-source* 'vampire.distorted.org.uk.)
+   (defhost www-frontend metalzone)
+   (defhost dns-frontend vampire))
   (t
    (setf *default-zone-source* 'guvnor.distorted.org.uk.)
-   (defhost www-frontend guvnor.demon)))
+   (defhost www-frontend guvnor.demon)
+   (defhost dns-frontend guvnor.demon)))
+
+;;;--------------------------------------------------------------------------
+;;; Main zone definition.
 
 (defzone distorted.org.uk
   ;;
@@ -50,7 +78,13 @@ (defzone distorted.org.uk
 			 (guvnor.ns :ip guvnor.demon))
   ;;
   ;; Mail servers
-  ((@ mail lists bugs cryptomail) :mx mail)
+  ((@ mail lists bugs cryptomail)
+   :mx mail
+   :srv ((:smtp mail)))
+  ;;
+  ;; Other services
+  :srv ((:http www)
+	(:ftp ftp))
   ;;
   ;; Colocated services
   ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
@@ -59,36 +93,49 @@ (defzone distorted.org.uk
   (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
   ;;
   ;; Wireless gateway
-  (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
+  (untrusted :net untrusted)
+  (evolution (untrusted :a evolution))
   ;;
   ;; Local services
   (@ :svc www-frontend)
-  ((www ftp wiki git bugs mail rawk)
+  ((www ftp wiki git bugs mail)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
-  ((db)
+  ((db tor i2p rawk)
    (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))
+  ((ntp1) (fretwank :svc metalzone))
+  ((www-cache wpad ntp news) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet
-  (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
-  (vampire (fretwank :a vampire))
-  (tubescreamer (fretwank :a tubescreamer))
+  (fretwank :net fretwank)
+  (metalzone (inet :a guvnor.demon)
+	     (fretwank :a metalzone))
+  (vampire (fretwank :a vampire)
+	   (untrusted :a vampire.untrusted)
+	   (iodine :a vampire.iodine))
   (obsidian (fretwank :a obsidian))
-  (fuzzface (virtual :a fuzzface))
-  (mz (virtual :a mz))
+  ;;
+  ;; Virtual network
+  (virtual :net virtual)
+  (crybaby (virtual :a crybaby))
+  (terror (virtual :a terror))
+  (iodine :net iodine)
+  ;;
+  ;; ITS
+  (its :net its)
+  (gw (its :a gw))
+  (mz (its :a mz))
   ;;
   ;; Delegations
   #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
-  ;;
-  ;; Networks
-  (fretwank :net fretwank)
-  (wireless :net wireless)
-  (virtual :net virtual))
+  (io :ns ((ns.io :ip dns-frontend))))
+
+;;;--------------------------------------------------------------------------
+;;; Other subsidiary zones.
 
 (defrevzone trusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
@@ -100,20 +147,17 @@ (defrevzone trusted
 
 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  :reverse untrusted
-  #+subnet/fretwank (wireless :ns (metalzone.ns vampire.ns))
-  #+subnet/fretwank (@ :cidr-delegation
-		       (wireless
-			(wireless
-			 198.29.172.wireless.198.29.172.in-addr.arpa))))
+  :reverse untrusted)
 
 (defzone dhcp.distorted.org.uk
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :net dhcp)
 
+(defzone io.distorted.org.uk
+  :ns ((ns :ip dns-frontend))
+  (about :txt "Fake zone used for IP-over-DNS tunnelling."))
+
 (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)))
+;;;----- That's all, folks --------------------------------------------------