X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/3dfd711ecbc0ef973de2ec51a56559e11665327f..0262908f24a75ed46335ec5741327c093cb271cc:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 1133965..48f5628 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,30 +4,23 @@
 
 (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.distorted.org.uk)
-   (defhost bloghost guvnor.distorted.org.uk)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)
 
 (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 ((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))