Major network reorganization.

[zones] / harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 11339651b6ddf4d4a5c3306718552124ed8ab3f3..3090579747bdd151ef3bfd0ced7b06c5f934b582 100644 (file)
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,22 +4,23 @@ (load "hosts.lisp" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 

+(setf *default-zone-source* 'vampire.distorted.org.uk.)

 (preferred-subnet-case
   (fretwank
 (preferred-subnet-case
   (fretwank

-   (setf *default-zone-source* 'vampire.distorted.org.uk.)
-   (defhost mail metalzone)
-   (defhost bloghost vampire))
+   (defhost mail vampire.fretwank)
+   (defhost bloghost vampire.fretwank))

   (t
   (t

-   (setf *default-zone-source* 'guvnor.distorted.org.uk.)
-   (defhost mail guvnor.distorted.org.uk)
-   (defhost bloghost guvnor.distorted.org.uk)))
+   (defhost mail vampire.demon)
+   (defhost bloghost vampire.demon)))

 
 (defzone harlequin.org.uk
   ;;
   ;; Nameservers
 
 (defzone harlequin.org.uk
   ;;
   ;; Nameservers

-  :ns ((mythic-beasts-1.ns :ip mythic-ns1)
-       (mythic-beasts-2.ns :ip mythic-ns2)
-       (guvnor.ns :ip guvnor.demon))
+  :ns #+subnet/fretwank ((vampire.ns :ip vampire))
+      #-subnet/fretwank ((mythic-beasts-1.ns :ip mythic-ns1)
+                        (mythic-beasts-2.ns :ip mythic-ns2)
+                        (radius.ns :ip radius.demon)
+                        (vampire.ns :ip vampire.demon))

   ;;
   ;; Mail servers
   :mx ((mail :ip mail))
   ;;
   ;; Mail servers
   :mx ((mail :ip mail))