hosts.lisp, distorted.lisp: artist is on the untrusted network.

[zones] / harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index e1bdb18632c822e4b22d252719c10a33f3af4802..15deeb7c2626a2fb55998d83e178e55042b1035d 100644 (file)
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,31 +4,23 @@ (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 ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (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))