hosts.lisp, distorted.lisp: Rename `virtual' network to `vpn'.

[zones] / harlequin.lisp

diff --git a/harlequin.lisp b/harlequin.lisp
index 3090579747bdd151ef3bfd0ced7b06c5f934b582..12b3008629ed6eddfe6cb1c3cf6a7b9ddb021ebe 100644 (file)
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -4,31 +4,25 @@ (load "hosts.lisp" :verbose nil)
 
 (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))