X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/5c420db9db95f85ecf202eb33715b515b7f005ba..b29264c578d1d5baba52a1a47365f588dbbce20f:/Makefile

diff --git a/Makefile b/Makefile
index b8dbcb7..fc2c0cb 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,20 @@ V_AT_0			 = @
 ###--------------------------------------------------------------------------
 ### Programs and options.
 
+## Zone checking.
 CHECKZONE		 = named-checkzone -i full \
 				-k fail -M fail -n fail -S fail -W fail
 
+## Zone installation.
+MASTER			 = localhost
+inside_MASTER		 = precision
+
+ifeq ($(MASTER),localhost)
+ZONEINST		 = userv zoneconf install
+else
+ZONEINST		 = ssh zoneconf@$(MASTER)
+endif
+
 ###--------------------------------------------------------------------------
 ### Utility functions.
 
@@ -50,23 +61,36 @@ ZONESETS		 =
 
 ZONESETS		+= distorted
 
-distorted_VIEWS		 = inet fretwank
-distorted_inet_NETS	 = inet
-distorted_fretwank_NETS	 = fretwank
+distorted_VIEWS		 = inside outside
+distorted_outside_NETS	 = dmz jump
+distorted_inside_NETS	 = any unsafe colo vpn
 
-distorted_all_ZONES	 = distorted.org.uk io.distorted.org.uk
-distorted_fretwank_ZONES = 199.29.172.in-addr.arpa
+distorted_all_ZONES	+= distorted.org.uk
 
-###--------------------------------------------------------------------------
-### The harlequin.org.uk zones.
+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	+= 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
 
-ZONESETS		+= harlequin
+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
 
-harlequin_VIEWS		 = inet fretwank
-harlequin_inet_NETS	 = inet
-harlequin_fretwank_NETS	 = fretwank
+###--------------------------------------------------------------------------
+### Other zones.
+
+## binswood.org.uk
+ZONESETS		+= binswood
+binswood_VIEWS		 = outside
+binswood_all_ZONES	+= binswood.org.uk
+binswood_all_ZONES	+= 27.165.10.in-addr.arpa
 
-harlequin_all_ZONES	 = harlequin.org.uk
+## odin.gg
+ZONESETS		+= odin
+odin_VIEWS		 = outside
+odin_all_ZONES		 = odin.gg
 
 ###--------------------------------------------------------------------------
 ### Zone construction machinery.
@@ -83,7 +107,8 @@ ALL_ZONESTAMPS = $(foreach s,$(ZONESETS), \
 $(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)) $<
+		hack) $(addprefix -s, \
+		$($(notdir $*)_$(call dir-nosl,$*)_NETS)) $<
 	$(V_AT)touch $@
 all: $(ALL_ZONESTAMPS)
 CLEANFILES += $(sort $(foreach s,$(ZONESETS), \
@@ -113,6 +138,17 @@ $(ALL_ZONECHECKS) : %.check : %.zone
 check: $(ALL_ZONECHECKS)
 .PHONY: check $(ALL_ZONECHECKS)
 
+## Finally we have to install the zone files.
+ALL_INSTALLS = $(foreach s,$(ZONESETS), \
+	$(foreach v,$($s_VIEWS), \
+	  $(foreach z,$($s_all_ZONES) $($s_$v_ZONES), \
+	    $v/$z.inst)))
+$(ALL_INSTALLS) : %.inst : %.check
+	$(call v_tag,INST)$(ZONEINST) \
+		$(call dir-nosl,$*) $(notdir $*) <$*.zone
+install: $(ALL_INSTALLS)
+.PHONY: install $(ALL_INSTALLS)
+
 ## Files to clean.
 clean:
 	rm -f $(CLEANFILES)