Merge branch 'origin' -- abandoned work

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index e85192270b660b1449fc54882095752de08ad2b3..b88ddcbfda8c0bbc61499b161a36c541b4d5f2ae 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -15,45 +15,67 @@ (defnet distorted.org.uk 172.29.198.0/23
     (virtual 32)))
 
 ;; Host allocations
-(defhost guvnor (unsafe))
 (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))
+
+(defhost guvnor (unsafe 1))
+(defhost metalzone (unsafe 2))
+(defhost evolution (unsafe 3))
+(defhost vampire (unsafe 4))
+
+(defhost tubescreamer (safe 1))
+(defhost obsidian (safe 2))
+
+(defhost evolution.wireless (wireless 1))
+
+(defhost fuzzface (virtual 1))
+(defhost mz (virtual 2))
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
-(setf *default-zone-source* 'guvnor.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)))
 
 (defzone distorted.org.uk
   ;;
   ;; Nameservers
-  :ns ((boyle.ns :ip boyle.nsict.org)
+  :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
-  ((@ lists bugs cryptomail) :mx guvnor)
+  ((@ mail lists bugs cryptomail) :mx mail)
   ;;
   ;; Colocated services
-  ((www ftp wiki git) :a boyle.nsict.org)
+  ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
   ;;
   ;; Entry is via little port-forwarding box
-  (guvnor (demon :a guvnor.demon)
-         (fretwank :a guvnor))
+  (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
   ;;
   ;; Wireless gateway
-  (evolution (fretwank :a evolution)
-            (wireless :a evolution.wireless))
+  (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
   ;;
   ;; Local services
-  (bugs :a guvnor.demon)
+  (@ :svc www-frontend)
+  ((www ftp git bugs mail rawk)
+   (inet :svc guvnor.demon)
+   (fretwank :svc metalzone))
+  ;;
+  ;; Internal services
+  ((news www-cache)
+   (fretwank :svc metalzone))
   ;;
   ;; Wired ethernet
-  (metalzone (fretwank :a metalzone))
+  (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
+  (vampire (fretwank :a vampire))
   (tubescreamer (fretwank :a tubescreamer))
   (obsidian (fretwank :a obsidian))
   (fuzzface (virtual :a fuzzface))
@@ -66,8 +88,8 @@ (defzone distorted.org.uk
   (virtual :net virtual))
 
 (defrevzone trusted
-  :ns ((metalzone.ns :ip metalzone))
+  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse trusted)
 (defrevzone untrusted
-  :ns ((metalzone.ns :ip metalzone))
+  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse untrusted)