X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/81db6dbf3f759b8e934118aaddde747d48ca7e20..b420e5ee9d13865f53b73119e4038884bbb57a63:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 65374b5..12b3008 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -1,33 +1,28 @@
 ;;; Zone file for harlequin.org.uk
 
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
-(preferred-subnet-case
-  (fretwank
-   (setf *default-zone-source* 'vampire.distorted.org.uk.)
-   (defhost mail metalzone)
-   (defhost bloghost vampire))
-  (t
-   (setf *default-zone-source* 'guvnor.distorted.org.uk.)
-   (defhost mail guvnor.demon)
-   (defhost bloghost guvnor.demon)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)
 
 (defzone harlequin.org.uk
-  ;;
+
   ;; Nameservers
-  :ns ((boyle.ns :ip boyle.nsict.org)
-       ns0.blackcatnetworks.co.uk.
-       ns1.blackcatnetworks.co.uk.)
-  ;;
+  :ns #+view/inside ((radius.ns :ip radius)
+		     (vampire.ns :ip vampire))
+      #-view/inside ((radius.ns :ip radius)
+		     (vampire.ns :ip vampire)
+		     (mythic-beasts-1.ns :ip mythic-ns1)
+		     (mythic-beasts-2.ns :ip mythic-ns2))
+
   ;; Mail servers
-  :mx ((mail :ip mail))
+  :mx ((mail :ip vampire))
   :srv ((:smtp mail))
-  ;;
+
   ;; Web service
   ((@ www) :svc boyle.nsict.org)
   :srv ((:http www))
-  ;;
+
   ;; Web log (currently local)
-  (bindery :svc bloghost))
+  (bindery :svc vampire))