distorted.org.uk: Dynamically allocate IP addresses and use names.

This removes address allocation from the zone specification, and means
that the network description, with all the hostnames and addresses, can
live somewhere else in the future.

diff --git a/distorted.org.uk.lisp b/distorted.org.uk.lisp
index 8c7a5a3..a677d71 100644 (file)
--- a/distorted.org.uk.lisp
+++ b/distorted.org.uk.lisp
@@ -4,7 +4,6 @@
 
 ;; 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,15 @@
       (safe 32))
     (virtual 32)))
 
-(defhost demon 83.105.60.35)
-(defhost metalzone (unsafe 2))
+;; Host allocations
+(defhost guvnor (unsafe))
+(defhost guvnor.demon 83.105.60.35)
+(defhost metalzone (unsafe))
+(defhost tubescreamer (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,7 +32,7 @@
   ;; 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)
@@ -35,17 +41,21 @@
   ((www ftp wiki) :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))
+  (fuzzface (virtual :a fuzzface))
+  (mz (virtual :a mz))
   ;;
   ;; Networks
   (fretwank :net fretwank)
@@ -59,4 +69,3 @@
 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone))
   :reverse untrusted)
-