Makefile: Replace the m4 crock with a proper GNU Make crock.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 416d98b..07f1ea8 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -83,12 +83,12 @@
 (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)
@@ -155,7 +155,7 @@
   (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 @@
 (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))