hosts.lisp, distorted.lisp: Proper assignments for colocated servers.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index 0c4632e..43c57e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,21 @@ 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.
 
@@ -51,8 +63,8 @@ ZONESETS               =
 ZONESETS               += distorted
 
 distorted_VIEWS                 = inside outside
-distorted_outside_NETS  = inet
-distorted_inside_NETS   = fretwank
+distorted_outside_NETS  = dmz jump
+distorted_inside_NETS   = unsafe colo
 
 distorted_all_ZONES     = distorted.org.uk io.distorted.org.uk
 distorted_inside_ZONES  = 199.29.172.in-addr.arpa
@@ -63,12 +75,23 @@ distorted_inside_ZONES       = 199.29.172.in-addr.arpa
 ZONESETS               += harlequin
 
 harlequin_VIEWS                 = inside outside
-harlequin_outside_NETS  = inet
-harlequin_inside_NETS   = fretwank
+harlequin_outside_NETS  = dmz
+harlequin_inside_NETS   = unsafe
 
 harlequin_all_ZONES     = harlequin.org.uk
 
 ###--------------------------------------------------------------------------
+### The felixpearce.com zones.
+
+ZONESETS               += felixpearce
+
+felixpearce_VIEWS       = inside outside
+felixpearce_outside_NETS = dmz
+felixpearce_inside_NETS         = unsafe
+
+felixpearce_all_ZONES   = felixpearce.com
+
+###--------------------------------------------------------------------------
 ### Zone construction machinery.
 
 ZONE                    = zone
@@ -83,7 +106,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 +137,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)