From 4a487d58d01e828cc7483134fb31aa20d9ab675f Mon Sep 17 00:00:00 2001 Message-Id: <4a487d58d01e828cc7483134fb31aa20d9ab675f.1715167479.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 18 Jun 2011 20:49:05 +0100 Subject: [PATCH] Makefile, distorted, harlequin: Rename `fretwank' to `internal'. Organization: Straylight/Edgeware From: Mark Wooding I think the time has come to take things a little more seriously. Naah, not really. But I'll put on a good show. --- Makefile | 14 +++++++------- distorted.lisp | 48 ++++++++++++++++++++++++------------------------ harlequin.lisp | 16 ++++++++-------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index b8dbcb7..0c4632e 100644 --- a/Makefile +++ b/Makefile @@ -50,21 +50,21 @@ ZONESETS = ZONESETS += distorted -distorted_VIEWS = inet fretwank -distorted_inet_NETS = inet -distorted_fretwank_NETS = fretwank +distorted_VIEWS = inside outside +distorted_outside_NETS = inet +distorted_inside_NETS = fretwank distorted_all_ZONES = distorted.org.uk io.distorted.org.uk -distorted_fretwank_ZONES = 199.29.172.in-addr.arpa +distorted_inside_ZONES = 199.29.172.in-addr.arpa ###-------------------------------------------------------------------------- ### The harlequin.org.uk zones. ZONESETS += harlequin -harlequin_VIEWS = inet fretwank -harlequin_inet_NETS = inet -harlequin_fretwank_NETS = fretwank +harlequin_VIEWS = inside outside +harlequin_outside_NETS = inet +harlequin_inside_NETS = fretwank harlequin_all_ZONES = harlequin.org.uk diff --git a/distorted.lisp b/distorted.lisp index 75174ab..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 #+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)) + :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)) ;; @@ -113,29 +113,29 @@ (defzone distorted.org.uk :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. - #+view/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 - #+view/fretwank (dhcp :ns (metalzone.ns vampire.ns)) - #+view/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)) diff --git a/harlequin.lisp b/harlequin.lisp index c7f9682..e1bdb18 100644 --- a/harlequin.lisp +++ b/harlequin.lisp @@ -6,9 +6,9 @@ (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)) + (internal + (defhost mail vampire) + (defhost bloghost vampire)) (t (defhost mail vampire.demon) (defhost bloghost vampire.demon))) @@ -16,11 +16,11 @@ (defhost bloghost vampire.demon))) (defzone harlequin.org.uk ;; ;; Nameservers - :ns #+view/fretwank ((vampire.ns :ip vampire)) - #-view/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 ((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)) ;; ;; Mail servers :mx ((mail :ip mail)) -- [mdw]