X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/92e992475fa9fae0b2b55f02142ee8df2e807a34..04db972978345f878d837a37edd8a0ea677ee771:/harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 3090579..12b3008 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,31 +4,25 @@
 
 (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 #+subnet/fretwank ((vampire.ns :ip vampire))
-      #-subnet/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
   ((@ www) :svc boyle.nsict.org)
   :srv ((:http www))
-  ;;
+
   ;; Web log (currently local)
-  (bindery :svc bloghost))
+  (bindery :svc vampire))