X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/a060fed3c1d17cbed6a40c4c861006f739e42228..a40e7df27641815edbd243bb456cfbc958d0eaf9:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index d661a67..60f854e 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -2,44 +2,81 @@
 
 (load "hosts" :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))
+  (untrusted 256)
   (trusted 256
     (fretwank 128
       (unsafe 32)
       (dhcp 32)
       (safe 32))
-    (virtual 32)))
+    (virtual 32)
+    (its 4)))
+
+;;;--------------------------------------------------------------------------
+;;; Host allocations
 
-;; Host allocations
-(defhost guvnor (unsafe))
+;; External addresses.
 (defhost guvnor.demon 80.177.3.76)
-(defhost metalzone (unsafe))
-(defhost tubescreamer (safe))
-(defhost obsidian (safe))
-(defhost evolution (unsafe))
-(defhost evolution.wireless (wireless))
-(defhost fuzzface (virtual))
-(defhost mz (virtual))
-(if (zone-preferred-subnet-p 'fretwank)
-    (defhost www-frontend metalzone)
-    (defhost www-frontend guvnor.demon))
+
+;; Unsafe network.
+(defhost guvnor (unsafe 1))
+(defhost metalzone (unsafe 2))
+;;(defhost evolution.fretwank (unsafe 3))
+(defhost vampire (unsafe 4))
+
+;; Safe network.
+(defhost tubescreamer (safe 1))
+(defhost obsidian (safe 2))
+
+;; Wireless network.
+(defhost vampire.untrusted (untrusted 1))
+(defhost evolution (untrusted 2))
+
+;; Virtual private network.
+(defhost crybaby (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))
+
+;;;--------------------------------------------------------------------------
+;;; Other definitions.
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
-(setf *default-zone-source* 'guvnor.distorted.org.uk.)
+
+(preferred-subnet-case
+  (fretwank
+   (setf *default-zone-source* 'vampire.distorted.org.uk.)
+   (defhost www-frontend metalzone))
+  (t
+   (setf *default-zone-source* 'guvnor.distorted.org.uk.)
+   (defhost www-frontend guvnor.demon)))
+
+;;;--------------------------------------------------------------------------
+;;; Main zone definition.
 
 (defzone distorted.org.uk
   ;;
   ;; Nameservers
-  :ns ((boyle.ns :ip boyle.nsict.org)
-       (chiark.ns :ip chiark.greenend.org.uk)
-       (guvnor.ns :ip guvnor.demon))
+  :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
-  ((@ 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))
@@ -48,34 +85,61 @@ (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 git bugs mail rawk)
+  ((www ftp wiki git bugs mail rawk)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
+  ((db tor)
+   (inet :svc guvnor.demon)
+   (fretwank :svc vampire))
+  (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
   ;;
   ;; Internal services
-  ((news www-cache)
-   (fretwank :svc metalzone))
+  ((news ntp1) (fretwank :svc metalzone))
+  ((www-cache wpad ntp) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet
+  (fretwank :net fretwank)
   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
-  (tubescreamer (fretwank :a tubescreamer))
+  (vampire (fretwank :a vampire) (untrusted :a vampire.untrusted))
   (obsidian (fretwank :a obsidian))
-  (fuzzface (virtual :a fuzzface))
-  (mz (virtual :a mz))
   ;;
-  ;; Networks
-  (fretwank :net fretwank)
-  (dhcp :net dhcp)
-  (wireless :net wireless)
-  (virtual :net virtual))
+  ;; Virtual network
+  (virtual :net virtual)
+  (crybaby (virtual :a crybaby))
+  ;;
+  ;; ITS
+  (its :net its)
+  (gw (its :a gw))
+  (mz (its :a mz))
+  ;;
+  ;; Delegations
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns)))
+
+;;;--------------------------------------------------------------------------
+;;; Other subsidiary zones.
 
 (defrevzone trusted
-  :ns ((metalzone.ns :ip metalzone))
-  :reverse 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))
+  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse untrusted)
+
+(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)))
+
+;;;----- That's all, folks --------------------------------------------------