X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/f54dd5ce2ae0a3a39ab6520ea898a6a62a280ad8..HEAD:/Makefile diff --git a/Makefile b/Makefile index 69191ed..29def38 100644 --- a/Makefile +++ b/Makefile @@ -62,22 +62,19 @@ ZONESETS = ZONESETS += distorted distorted_VIEWS = inside outside -distorted_outside_NETS = dmz jump -distorted_inside_NETS = any unsafe colo vpn +distorted_outside_NETS = dmz +distorted_inside_NETS = any unsafe vpn upn distorted_all_ZONES += distorted.org.uk -distorted_all_ZONES += 144-159.204.49.62.in-addr.arpa -distorted_all_ZONES += 64-79.198.13.212.in-addr.arpa +distorted_all_ZONES += 195.113.2.81.in-addr.arpa +distorted_all_ZONES += 128-143.238.187.81.in-addr.arpa +distorted_all_ZONES += 64-79.12.169.217.in-addr.arpa +distorted_all_ZONES += 2.9.c.0.0.b.8.0.1.0.0.2.ip6.arpa +distorted_all_ZONES += 9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa distorted_all_ZONES += 199.29.172.in-addr.arpa -distorted_all_ZONES += 8.9.b.1.9.0.f.1.0.7.4.0.1.0.0.2.ip6.arpa -distorted_all_ZONES += 0.4.7.9.0.7.4.0.1.0.0.2.ip6.arpa - -distorted_all_ZONES += 9.d.1.0.0.0.0.0.8.a.b.0.1.0.0.2.ip6.arpa -distorted_all_ZONES += 9.d.1.0.8.a.b.0.1.0.0.2.ip6.arpa - distorted_outside_NSDIFF = -sradius.dmz.distorted.org.uk ###-------------------------------------------------------------------------- @@ -99,16 +96,12 @@ ZONESETS += odin odin_VIEWS = outside odin_all_ZONES = odin.gg -## goodhstg.com -ZONESETS += goodhstg -goodhstg_VIEWS = outside -goodhstg_all_ZONES = goodhstg.com - ###-------------------------------------------------------------------------- ### Zone construction machinery. ZONE = zone V_ZONE = $(call v_tag,ZONE)$(ZONE) +ZONEOPTS = .SECONDEXPANSION: #sorry @@ -120,7 +113,7 @@ $(ALL_ZONESTAMPS) : %.zonestamp : $$(notdir $$*).lisp hosts.lisp $(V_AT)mkdir -p $(dir $*) $(V_ZONE) -d$(dir $*) -fview/$(call dir-nosl,$*)$(hack \ hack) $(addprefix -s, \ - $($(notdir $*)_$(call dir-nosl,$*)_NETS)) $< + $($(notdir $*)_$(call dir-nosl,$*)_NETS)) $(ZONEOPTS) $< $(V_AT)touch $@ all: $(ALL_ZONESTAMPS) CLEANFILES += $(sort $(foreach s,$(ZONESETS), \ @@ -162,13 +155,13 @@ ALL_ZONEDIFFS = $(foreach s,$(ZONESETS), \ $(foreach v,$($s_VIEWS), \ $(foreach z,$($s_all_ZONES) $($s_$v_ZONES), \ $v/$z.zonediff))) -run-nsdiff = nsdiff -d -v "" $2 \ +run-nsdiff = nsdiff -v "" $2 \ $($($(call notdir,$1)_ZONESET)_$(call dir-nosl,$1)_NSDIFF) \ $(call notdir,$1) $1.zone $(ALL_ZONEDIFFS) : %.zonediff : %.zone $(call v_tag,NSDIFF)$(call run-nsdiff,$*,-q); \ rc=$$?; case $$rc in 1) $(call run-nsdiff,$*); rc=$$? ;; esac; \ - case $$rc in 0 | 1) : ;; *) exit $$? ;; esac + case $$rc in 0 | 1) : ;; *) exit $$rc ;; esac diff: $(ALL_ZONEDIFFS) ## Finally we have to install the zone files.