X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/4b9c38b06f971d2d29469d59ebafa789927b9992..9dc37b96e57f7c34c2c0fad48d11c3a296b16830:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 08e8f30..12b3008 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -1,19 +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")
-(setf *default-zone-source* 'guvnor.distorted.org.uk.)
+
+(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 guvnor.demon))
-  ;;
+  :mx ((mail :ip vampire))
+  :srv ((:smtp mail))
+
   ;; Web service
-  ((@ www) :a boyle.nsict.org))
+  ((@ www) :svc boyle.nsict.org)
+  :srv ((:http www))
+
+  ;; Web log (currently local)
+  (bindery :svc vampire))