X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/92e992475fa9fae0b2b55f02142ee8df2e807a34..1ec6ca016e1a99ed62a6fbd9148cd6abe6387872:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 416d98b..75174ab 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -83,12 +83,12 @@    (defhost dns-frontend vampire.inet)))
 (defzone distorted.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)
-			 (chiark.ns :ip chiark.greenend.org.uk)
-			 (radius.ns :ip radius.inet)
-			 (vampire.ns :ip vampire.inet))
+  :ns #+view/fretwank ((vampire.ns :ip vampire))
+      #-view/fretwank ((mythic-beasts-1.ns :ip mythic-ns1)
+		       (mythic-beasts-2.ns :ip mythic-ns2)
+		       (chiark.ns :ip chiark.greenend.org.uk)
+		       (radius.ns :ip radius.inet)
+		       (vampire.ns :ip vampire.inet))
   ;;
   ;; Mail servers.
   ((@ mail lists bugs cryptomail)
@@ -110,7 +110,7 @@ (defzone distorted.org.uk
   (evolution (untrusted :a evolution))
   ;;
   ;; Local services.
-  (@ :svc www-frontend)
+  :svc www-frontend
   ((www ftp wiki git bugs mail db tor i2p rawk vox www-cache)
    (inet :svc vampire.inet)
    (fretwank :svc vampire))
@@ -155,7 +155,7 @@ (defzone distorted.org.uk
   (mz (its :a mz))
   ;;
   ;; Delegations.
-  #+subnet/fretwank (dhcp :ns (vampire.ns))
+  #+view/fretwank (dhcp :ns (vampire.ns))
   (io :ns ((ns.io :ip dns-frontend))))
 
 ;;;--------------------------------------------------------------------------
@@ -164,10 +164,10 @@ (defzone distorted.org.uk
 (defrevzone trusted
   :ns ((vampire.ns :ip vampire))
   :reverse trusted
-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
-  #+subnet/fretwank (@ :cidr-delegation
-		       (dhcp
-			(dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+  #+view/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  #+view/fretwank (@ :cidr-delegation
+		     (dhcp
+		      (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
 
 (defrevzone untrusted
   :ns ((vampire.ns :ip vampire))