Overhaul for service role names and split-horizon craziness.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index e85192270b660b1449fc54882095752de08ad2b3..d661a67faa8cee83a63fa700fb4d03adae583a99 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -24,6 +24,9 @@ (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))
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 (setf *default-zone-source* 'guvnor.distorted.org.uk.)
@@ -36,24 +39,29 @@ (defzone distorted.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))
   (tubescreamer (fretwank :a tubescreamer))
   (obsidian (fretwank :a obsidian))
   (fuzzface (virtual :a fuzzface))