X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/7ee9a1c50fce860c4725d94acda52dd001fbe88e..1ec6ca016e1a99ed62a6fbd9148cd6abe6387872:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 08e8f30..c7f9682 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -1,19 +1,34 @@
 ;;; Zone file for harlequin.org.uk
 
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
-(setf *default-zone-source* 'guvnor.distorted.org.uk.)
+
+(setf *default-zone-source* 'vampire.distorted.org.uk.)
+(preferred-subnet-case
+  (fretwank
+   (defhost mail vampire.fretwank)
+   (defhost bloghost vampire.fretwank))
+  (t
+   (defhost mail vampire.demon)
+   (defhost bloghost vampire.demon)))
 
 (defzone harlequin.org.uk
   ;;
   ;; Nameservers
-  :ns ((boyle.ns :ip boyle.nsict.org)
-       ns0.blackcatnetworks.co.uk.
-       ns1.blackcatnetworks.co.uk.)
+  :ns #+view/fretwank ((vampire.ns :ip vampire))
+      #-view/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 guvnor.demon))
+  :mx ((mail :ip mail))
+  :srv ((:smtp mail))
   ;;
   ;; Web service
-  ((@ www) :a boyle.nsict.org))
+  ((@ www) :svc boyle.nsict.org)
+  :srv ((:http www))
+  ;;
+  ;; Web log (currently local)
+  (bindery :svc bloghost))