*.lof
*.lot
*.toc
+Makefile
+++ /dev/null
-## Makefile for mdw's zones
-
-ZONE = zone
-
-HIBACHI_ZONES = hibachidealers.com.zone
-DISTORTED_ZONES = \
- distorted.org.uk.zone \
- 198.29.172.in-addr.arpa.zone \
- 199.29.172.in-addr.arpa.zone
-ALL_ZONES = \
- $(HIBACHI_ZONES) \
- $(DISTORTED_ZONES)
-
-INITEX = pdfetex -ini
-DOCS = distorted.tex
-DOC_OUTPUTS = $(foreach suffix,dvi ps,\
- $(patsubst %.tex,%.$(suffix),$(DOCS)))
-
-all: $(ALL_ZONES) $(DOC_OUTPUTS)
-
-publish:; mkdir publish
-
-install: all publish
- for i in $(ALL_ZONES); do \
- cmp $$i publish/$$i >/dev/null 2>&1 && continue; \
- cp $$i publish/$$i.new && mv publish/$$i.new publish/$$i; \
- echo -n "$${i%.zone}: "; userv root named-reload $${i%.zone}; \
- done
-
-$(HIBACHI_ZONES): hibachidealers.com.lisp hosts.lisp
- $(ZONE) $<
-
-$(DISTORTED_ZONES): distorted.org.uk.lisp hosts.lisp
- $(ZONE) $<
-
-%.fmt: %.tex
- $(INITEX) \&latex $<
-
-%.dvi: %.tex %.fmt
- latex \&$* $<
- latex \&$* $<
-
-%.ps: %.dvi
- dvips -o $@ $<
-
-clean:
- rm -f $(ALL_ZONES) *.toc *.lof *.lot *.log *.dvi *.ps *.aux
--- /dev/null
+### Makefile for mdw's zones
+###
+### Preprocessed with m4, for the sake of madness
+
+m4_divert(-1)
+###--------------------------------------------------------------------------
+### M4 trickery.
+
+m4_changequote([, ])
+m4_define([_dolist], [m4_pushdef([$1])__loop($@)m4_popdef([$1])])
+m4_define([__loop], [m4_ifelse([$2], [()], ,m4_dnl
+[m4_define([$1], __first$2)$3[]__loop([$1],(m4_shift$2),[$3])])])
+m4_define([__first], [$1])
+
+m4_define([DOMAIN], [m4_dnl
+m4_pushdef([_undivert], [m4_divert(]m4_divnum[)m4_popdef([_undivert])])m4_dnl
+m4_divert(10)m4_dnl
+$1_SUBNETS = _dolist([_subnet], [($2)], [ _subnet])
+$1_ZONES = _dolist([_zone], [($3)], [ _zone])
+$1_ZONE_FILES = _dolist([_subnet], [($2)],
+ [_dolist([_zone], [($3)], [ _subnet/_zone.zone])])
+ALL_SUBNETS += $($1_SUBNETS)
+ALL_ZONES += $($1_ZONES)
+ALL_ZONE_FILES += $($1_ZONE_FILES)
+m4_divert(30)m4_dnl
+$($1_ZONE_FILES): $1.lisp $(ZONEDEPS)
+ mkdir -p $($1_SUBNETS)m4_dnl
+_dolist([_subnet], [($2)], [
+ $(ZONE) -d _subnet/ -f subnet/_subnet -s _subnet $1.lisp])
+_undivert[]m4_dnl
+])
+
+m4_divert(-1)
+###--------------------------------------------------------------------------
+### Domains.
+
+DOMAIN([distorted], [inet, fretwank],
+ [distorted.org.uk, 198.29.172.in-addr.arpa, 199.29.172.in-addr.arpa])
+DOMAIN([harlequin], [inet], [harlequin.org.uk])
+
+m4_divert(0)
+###--------------------------------------------------------------------------
+### Make configuration.
+
+ZONE = zone
+
+ALL_ZONES =
+ALL_ZONE_FILES =
+ALL_SUBNETS =
+
+PUBLISH = publish
+
+ZONEDEPS = hosts.lisp
+
+DOCS = distorted.tex
+DOC_OUTPUTS = $(foreach suffix,dvi ps,\
+ $(patsubst %.tex,%.$(suffix),$(DOCS)))
+
+m4_divert(20)
+###--------------------------------------------------------------------------
+### Rules
+
+all: $(ALL_ZONE_FILES) $(DOC_OUTPUTS)
+
+install: all
+ ##
+ ## Make directories
+ rm -rf $(PUBLISH).new
+ mkdir $(PUBLISH).new
+ cd $(PUBLISH).new && mkdir $(sort $(ALL_SUBNETS))
+ ##
+ ## Copy zone files to output
+ for i in $(ALL_ZONE_FILES); do \
+ cp $$i $(PUBLISH).new/$$i; \
+ done
+ ##
+ ## Make links as necessary
+ cd $(PUBLISH).new; \
+ for i in $(sort $(ALL_SUBNETS)); do \
+ test $$i = inet && continue; \
+ for z in $(sort $(ALL_ZONES)); do \
+ test -f $$i/$$z.zone || ln -s ../inet/$$z.zone $$i/$$z.zone; \
+ done; \
+ done
+ ##
+ ## Switch over
+ rm -rf $(PUBLISH).old
+ mv $(PUBLISH) $(PUBLISH).old
+ mv $(PUBLISH).new $(PUBLISH)
+ ##
+ ## Get nameserver to reload changed zones
+ for i in $(sort $(ALL_SUBNETS)); do \
+ for z in $(sort $(ALL_ZONES)); do \
+ cmp $(PUBLISH)/$$i/$$z.zone $(PUBLISH).old/$$i/$$z.zone \
+ >/dev/null 2>&1 && continue; \
+ echo -n "$$z ($$i): "; \
+ userv root named-reload $$z $$i; \
+ done; \
+ done
+ ##
+ ## Clear up mess
+ rm -rf $(PUBLISH).old
+
+%.dvi: %.tex
+ latex $<
+ latex $<
+
+%.ps: %.dvi
+ dvips -o $@ $<
+
+m4_divert(40)
+Makefile: Makefile.m4
+ m4 -P $< >$@.new
+ mv $@.new $@
+
+clean:
+ rm -f $(ALL_ZONE_FILES) *.toc *.lof *.lot *.log *.dvi *.ps *.aux
+ rmdir $(sort $(ALL_SUBNETS))
+
+###----- That's all, folks --------------------------------------------------
--- /dev/null
+;;; Zone file for distorted.org.uk
+
+(load "hosts" :verbose nil)
+
+;; Network allocations
+;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
+(defnet distorted.org.uk 172.29.198.0/23
+ (untrusted 256
+ (wireless 64))
+ (trusted 256
+ (fretwank 128
+ (unsafe 32)
+ (dhcp 32)
+ (safe 32))
+ (virtual 32)))
+
+;; Host allocations
+(defhost guvnor.demon 80.177.3.76)
+
+(defhost guvnor (unsafe 1))
+(defhost metalzone (unsafe 2))
+(defhost evolution (unsafe 3))
+(defhost vampire (unsafe 4))
+
+(defhost tubescreamer (safe 1))
+(defhost obsidian (safe 2))
+
+(defhost evolution.wireless (wireless 1))
+
+(defhost fuzzface (virtual 1))
+(defhost mz (virtual 2))
+
+(setf *default-zone-admin* "hostmaster@distorted.org.uk")
+
+(preferred-subnet-case
+ (fretwank
+ (setf *default-zone-source* 'metalzone.distorted.org.uk.)
+ (defhost www-frontend metalzone))
+ (t
+ (setf *default-zone-source* 'guvnor.distorted.org.uk.)
+ (defhost www-frontend guvnor.demon)))
+
+(defzone distorted.org.uk
+ ;;
+ ;; Nameservers
+ :ns #+subnet/fretwank
+ ((metalzone.ns :ip metalzone)
+ (vampire.ns :ip vampire))
+ #-subnet/fretwank
+ ((boyle.ns :ip boyle.nsict.org)
+ (chiark.ns :ip chiark.greenend.org.uk)
+ (guvnor.ns :ip guvnor.demon))
+ ;;
+ ;; Mail servers
+ ((@ mail lists bugs cryptomail) :mx mail)
+ ;;
+ ;; Colocated services
+ ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
+ ;;
+ ;; Entry is via little port-forwarding box
+ (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
+ ;;
+ ;; Wireless gateway
+ (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
+ ;;
+ ;; Local services
+ (@ :svc www-frontend)
+ ((www ftp git bugs mail rawk)
+ (inet :svc guvnor.demon)
+ (fretwank :svc metalzone))
+ ;;
+ ;; Internal services
+ ((news www-cache)
+ (fretwank :svc metalzone))
+ ;;
+ ;; Wired ethernet
+ (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
+ (vampire (fretwank :a vampire))
+ (tubescreamer (fretwank :a tubescreamer))
+ (obsidian (fretwank :a obsidian))
+ (fuzzface (virtual :a fuzzface))
+ (mz (virtual :a mz))
+ ;;
+ ;; Networks
+ (fretwank :net fretwank)
+ (dhcp :net dhcp)
+ (wireless :net wireless)
+ (virtual :net virtual))
+
+(defrevzone trusted
+ :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
+ :reverse trusted)
+(defrevzone untrusted
+ :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
+ :reverse untrusted)
+++ /dev/null
-;;; Zone file for distorted.org.uk
-
-(load "hosts" :verbose nil)
-
-;; Network allocations
-;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
-(defnet distorted.org.uk 172.29.198.0/23
- (untrusted 256
- (wireless 64))
- (trusted 256
- (fretwank 128
- (unsafe 32)
- (dhcp 32)
- (safe 32))
- (virtual 32)))
-
-;; Host allocations
-(defhost guvnor (unsafe))
-(defhost guvnor.demon 80.177.3.76)
-(defhost metalzone (unsafe))
-(defhost tubescreamer (safe))
-(defhost obsidian (safe))
-(defhost evolution (unsafe))
-(defhost evolution.wireless (wireless))
-(defhost fuzzface (virtual))
-(defhost mz (virtual))
-
-(setf *default-zone-admin* "hostmaster@distorted.org.uk")
-(setf *default-zone-source* 'guvnor.distorted.org.uk.)
-
-(defzone distorted.org.uk
- ;;
- ;; Nameservers
- :ns ((boyle.ns :ip boyle.nsict.org)
- (chiark.ns :ip chiark.greenend.org.uk)
- (guvnor.ns :ip guvnor.demon))
- ;;
- ;; Mail servers
- ((@ lists bugs cryptomail) :mx guvnor)
- ;;
- ;; Colocated services
- ((www ftp wiki git) :a boyle.nsict.org)
- ;;
- ;; Entry is via little port-forwarding box
- (guvnor (demon :a guvnor.demon)
- (fretwank :a guvnor))
- ;;
- ;; Wireless gateway
- (evolution (fretwank :a evolution)
- (wireless :a evolution.wireless))
- ;;
- ;; Local services
- (bugs :a guvnor.demon)
- ;;
- ;; Wired ethernet
- (metalzone (fretwank :a metalzone))
- (tubescreamer (fretwank :a tubescreamer))
- (obsidian (fretwank :a obsidian))
- (fuzzface (virtual :a fuzzface))
- (mz (virtual :a mz))
- ;;
- ;; Networks
- (fretwank :net fretwank)
- (dhcp :net dhcp)
- (wireless :net wireless)
- (virtual :net virtual))
-
-(defrevzone trusted
- :ns ((metalzone.ns :ip metalzone))
- :reverse trusted)
-(defrevzone untrusted
- :ns ((metalzone.ns :ip metalzone))
- :reverse untrusted)
-%&distorted
-
-\ifx\dumped\xxundefined
-
\documentclass[article, a4paper, 10pt, notitlepage, numbering]{strayman}
\usepackage[palatino, helvetica, maths=cmr]{mdwfonts}
\usepackage[T1]{fontenc}
\errorcontextlines=999
-\let\dumped\relax\expandafter\dump\fi
-
\begin{document}
\title{@l{distorted.org.uk} network design}
\author{Mark Wooding}
--- /dev/null
+;;; Zone file for harlequin.org.uk
+
+(load "hosts" :verbose nil)
+
+(setf *default-zone-admin* "hostmaster@distorted.org.uk")
+(setf *default-zone-source* 'guvnor.distorted.org.uk.)
+
+(defzone harlequin.org.uk
+ ;;
+ ;; Nameservers
+ :ns ((boyle.ns :ip boyle.nsict.org)
+ ns0.blackcatnetworks.co.uk.
+ ns1.blackcatnetworks.co.uk.)
+ ;;
+ ;; Mail servers
+ :mx ((mail :ip guvnor.demon))
+ ;;
+ ;; Web service
+ ((@ www) :a boyle.nsict.org))
+++ /dev/null
-;;; Zone source for hibachidealers.com
-
-(load "hosts" :verbose nil)
-
-(setf *default-zone-source* 'guvnor.distorted.org.uk.)
-
-(defzone hibachidealers.com
- ;;
- ;; Name servers
- :ns ((boyle.ns :ip boyle.nsict.org)
- (chiark.ns :ip chiark.greenend.org.uk)
- (mccoy.ns :ip mccoy.flatline.org.uk))
- (guvnor.ns :a guvnor.distorted.org.uk)
- ;;
- ;; Colocated services
- ((@ www www-test) :a boyle.nsict.org)
- ;;
- ;; Mail servers
- :mx ((guvnor.mx :ip guvnor.distorted.org.uk)))
~mdw / zones / commitdiff