distorted.lisp, harlequin.lisp: Use explicit filetype for `hosts.lisp'.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8ab90aff09475b5ab245d5ad96a9f4020b0569f9..b9bf87bfbaeef7718bd8289d2147cf19c86954cd 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -1,13 +1,15 @@
 ;;; 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.)
 
 (defnet distorted.org.uk 172.29.198.0/23
-  (untrusted 256)
+  (untrusted 256
+    (wireless 128)
+    (iodine 16))
   (trusted 256
     (fretwank 128
       (unsafe 32)
@@ -25,7 +27,7 @@ (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.
@@ -33,11 +35,15 @@ (defhost tubescreamer (safe 1))
 (defhost obsidian (safe 2))
 
 ;; Wireless network.
-(defhost evolution.untrusted (untrusted 1))
-(defhost vampire.untrusted (untrusted 2))
+(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))
 
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
@@ -51,11 +57,13 @@ (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.
@@ -86,31 +94,36 @@ (defzone distorted.org.uk
   ;;
   ;; Wireless gateway
   (untrusted :net untrusted)
-  (evolution (fretwank :a evolution) (untrusted :a evolution.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
   (fretwank :net fretwank)
-  (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
-  (vampire (fretwank :a vampire) (untrusted :a vampire.untrusted))
+  (metalzone (inet :a guvnor.demon)
+            (fretwank :a metalzone))
+  (vampire (fretwank :a vampire)
+          (untrusted :a vampire.untrusted)
+          (iodine :a vampire.iodine))
   (obsidian (fretwank :a obsidian))
   ;;
   ;; Virtual network
   (virtual :net virtual)
   (crybaby (virtual :a crybaby))
+  (terror (virtual :a terror))
+  (iodine :net iodine)
   ;;
   ;; ITS
   (its :net its)
@@ -118,7 +131,8 @@ (defzone distorted.org.uk
   (mz (its :a mz))
   ;;
   ;; Delegations
-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns)))
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  (io :ns ((ns.io :ip dns-frontend))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
@@ -139,6 +153,10 @@ (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)))