distorted: Different nameservers inside and out; add vampire.

Also make the build system pass feature flags on so that we can build
the nameserver lists properly.

diff --git a/Makefile.m4 b/Makefile.m4
index 49b4376ec6a0c03edd83145ae1aa271ef42639e9..fa220a3675ca896ea924499c226caddc5f8824f1 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -26,7 +26,7 @@ m4_divert(30)m4_dnl
 $($1_ZONE_FILES): $1.lisp $(ZONEDEPS)
        mkdir -p $($1_SUBNETS)m4_dnl
 _dolist([_subnet], [($2)], [
 $($1_ZONE_FILES): $1.lisp $(ZONEDEPS)
        mkdir -p $($1_SUBNETS)m4_dnl
 _dolist([_subnet], [($2)], [

-       $(ZONE) -d _subnet/ -s _subnet $1.lisp])
+       $(ZONE) -d _subnet/ -f subnet/_subnet -s _subnet $1.lisp])

 _undivert[]m4_dnl
 ])
 
 _undivert[]m4_dnl
 ])
 

diff --git a/distorted.lisp b/distorted.lisp
index d661a67faa8cee83a63fa700fb4d03adae583a99..b88ddcbfda8c0bbc61499b161a36c541b4d5f2ae 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -15,26 +15,39 @@ (defnet distorted.org.uk 172.29.198.0/23
     (virtual 32)))
 
 ;; Host allocations
     (virtual 32)))
 
 ;; Host allocations

-(defhost guvnor (unsafe))

 (defhost guvnor.demon 80.177.3.76)
 (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))
-(if (zone-preferred-subnet-p 'fretwank)
-    (defhost www-frontend metalzone)
-    (defhost www-frontend guvnor.demon))
+
+(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-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
 
 (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))
   ;;
        (chiark.ns :ip chiark.greenend.org.uk)
        (guvnor.ns :ip guvnor.demon))
   ;;


@@ -62,6 +75,7 @@ (defzone distorted.org.uk
   ;;
   ;; Wired ethernet
   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
   ;;
   ;; Wired ethernet
   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))

+  (vampire (fretwank :a vampire))

   (tubescreamer (fretwank :a tubescreamer))
   (obsidian (fretwank :a obsidian))
   (fuzzface (virtual :a fuzzface))
   (tubescreamer (fretwank :a tubescreamer))
   (obsidian (fretwank :a obsidian))
   (fuzzface (virtual :a fuzzface))


@@ -74,8 +88,8 @@ (defzone distorted.org.uk
   (virtual :net virtual))
 
 (defrevzone trusted
   (virtual :net virtual))
 
 (defrevzone trusted

-  :ns ((metalzone.ns :ip metalzone))
+  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))

   :reverse trusted)
 (defrevzone untrusted
   :reverse trusted)
 (defrevzone untrusted

-  :ns ((metalzone.ns :ip metalzone))
+  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))

   :reverse untrusted)
   :reverse untrusted)