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

diff --git a/distorted.lisp b/distorted.lisp
index 416d98b..b264645 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -70,7 +70,7 @@ (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
 (setf *default-zone-source* 'vampire.distorted.org.uk.)
 (preferred-subnet-case
-  (fretwank
+  (internal
    (defhost www-frontend vampire)
    (defhost dns-frontend vampire))
   (t
@@ -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/inside ((vampire.ns :ip vampire))
+      #-view/inside ((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)
@@ -101,7 +101,7 @@ (defzone distorted.org.uk
   ;;
   ;; Entry is via little router box.
   (inet :net inet)
-  (guvnor (inet :a guvnor.inet) (fretwank :svc gate.inet))
+  (guvnor (inet :a guvnor.inet) (internal :svc gate.inet))
   (gate (inet :a gate.inet))
   (nat (inet :a nat.inet))
   ;;
@@ -110,32 +110,32 @@ (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))
+   (internal :svc vampire))
   ;;
   ;; Internal services.
-  ((ntp) (fretwank :svc ibanez))
-  ((wpad ntp1 news) (fretwank :svc vampire))
+  ((ntp) (internal :svc ibanez))
+  ((wpad ntp1 news) (internal :svc vampire))
   ;;
   ;; Wired ethernet.
-  (fretwank :net fretwank)
-  (vampire (fretwank :a vampire)
+  (internal :net fretwank)
+  (vampire (internal :a vampire)
 	   (inet :a vampire.inet)
 	   (untrusted :a vampire.untrusted)
 	   (iodine :a vampire.iodine))
-  (obsidian (fretwank :a obsidian))
-  (ibanez (fretwank :a ibanez)
+  (obsidian (internal :a obsidian))
+  (ibanez (internal :a ibanez)
 	  (inet :a ibanez.inet))
-  (radius (fretwank :a radius)
+  (radius (internal :a radius)
 	  (inet :a radius.inet)
 	  (untrusted :a radius.untrusted))
-  (roadstar (fretwank :a roadstar)
+  (roadstar (internal :a roadstar)
 	    (inet :a roadstar.inet))
-  (jem (fretwank :a jem)
+  (jem (internal :a jem)
        (inet :a jem.inet))
-  (artist (fretwank :a artist)
+  (artist (internal :a artist)
 	  (inet :a artist.inet))
   (gibson :cname gibson.dhcp)
   (lespaul :cname lespaul.dhcp)
@@ -155,7 +155,7 @@ (defzone distorted.org.uk
   (mz (its :a mz))
   ;;
   ;; Delegations.
-  #+subnet/fretwank (dhcp :ns (vampire.ns))
+  #+view/inside (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/inside (dhcp :ns (metalzone.ns vampire.ns))
+  #+view/inside (@ :cidr-delegation
+		   (dhcp
+		    (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
 
 (defrevzone untrusted
   :ns ((vampire.ns :ip vampire))