X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/4a487d58d01e828cc7483134fb31aa20d9ab675f..ff6c53ad07d4f9987d648085e8c0656fa825322d:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index e1bdb18..789282a 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,26 +4,20 @@ (load "hosts.lisp" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
-(setf *default-zone-source* 'vampire.distorted.org.uk.)
-(preferred-subnet-case
-  (internal
-   (defhost mail vampire)
-   (defhost bloghost vampire))
-  (t
-   (defhost mail vampire.demon)
-   (defhost bloghost vampire.demon)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)
 
 (defzone harlequin.org.uk
   ;;
   ;; Nameservers
-  :ns #+view/inside ((vampire.ns :ip vampire))
-      #-view/inside ((mythic-beasts-1.ns :ip mythic-ns1)
-		     (mythic-beasts-2.ns :ip mythic-ns2)
-		     (radius.ns :ip radius.demon)
-		     (vampire.ns :ip vampire.demon))
+  :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
@@ -31,4 +25,4 @@ (defzone harlequin.org.uk
   :srv ((:http www))
   ;;
   ;; Web log (currently local)
-  (bindery :svc bloghost))
+  (bindery :svc vampire))