X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/5c420db9db95f85ecf202eb33715b515b7f005ba..d7af5ae71156722cdaef603204a6181b1ef72fdd:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index c7f9682..789282a 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,26 +4,20 @@
 
 (setf *default-zone-admin* "hostmaster@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)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)
 
 (defzone harlequin.org.uk
   ;;
   ;; Nameservers
-  :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))
+  :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 @@
   :srv ((:http www))
   ;;
   ;; Web log (currently local)
-  (bindery :svc bloghost))
+  (bindery :svc vampire))