X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/e80b4c2d249c90cd0229917b1627692e28525ee1..4acd48907a06f598a4c76817e9f75022107021fc:/distorted.org.uk.lisp

diff --git a/distorted.org.uk.lisp b/distorted.org.uk.lisp
index 8c7a5a3..e851922 100644
--- a/distorted.org.uk.lisp
+++ b/distorted.org.uk.lisp
@@ -4,7 +4,6 @@ (load "hosts" :verbose nil)
 
 ;; Network allocations
 ;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
-
 (defnet distorted.org.uk 172.29.198.0/23
   (untrusted 256
     (wireless 64))
@@ -15,8 +14,16 @@ (defnet distorted.org.uk 172.29.198.0/23
       (safe 32))
     (virtual 32)))
 
-(defhost demon 83.105.60.35)
-(defhost metalzone (unsafe 2))
+;; 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))
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 (setf *default-zone-source* 'guvnor.distorted.org.uk.)
@@ -26,26 +33,31 @@ (defzone distorted.org.uk
   ;; Nameservers
   :ns ((boyle.ns :ip boyle.nsict.org)
        (chiark.ns :ip chiark.greenend.org.uk)
-       (guvnor.ns :ip demon))
+       (guvnor.ns :ip guvnor.demon))
   ;;
   ;; Mail servers
   ((@ lists bugs cryptomail) :mx guvnor)
   ;;
   ;; Colocated services
-  ((www ftp wiki) :a boyle.nsict.org)
+  ((www ftp wiki git) :a boyle.nsict.org)
   ;;
   ;; Entry is via little port-forwarding box
-  (guvnor (demon :a demon)
-	  (fretwank :a (unsafe 1)))
+  (guvnor (demon :a guvnor.demon)
+	  (fretwank :a guvnor))
+  ;;
+  ;; Wireless gateway
+  (evolution (fretwank :a evolution)
+	     (wireless :a evolution.wireless))
   ;;
   ;; Local services
-  (bugs :a demon)
+  (bugs :a guvnor.demon)
   ;;
   ;; Wired ethernet
   (metalzone (fretwank :a metalzone))
-  (tubescreamer (fretwank :a (safe 1)))
-  (fuzzface (virtual :a (virtual 1)))
-  (mz (virtual :a (virtual 2)))
+  (tubescreamer (fretwank :a tubescreamer))
+  (obsidian (fretwank :a obsidian))
+  (fuzzface (virtual :a fuzzface))
+  (mz (virtual :a mz))
   ;;
   ;; Networks
   (fretwank :net fretwank)
@@ -59,4 +71,3 @@ (defrevzone trusted
 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone))
   :reverse untrusted)
-