hosts.lisp: Fix IPv6 network address for Jump.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index 6c6a9dffc2f897b5d9e1da3e91848aa3c2c8f8c8..9199918eadb4e27290c47bbc797a1eee98712eae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,22 +62,18 @@ 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    += 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 +95,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 +112,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), \
@@ -168,7 +160,7 @@ run-nsdiff = nsdiff -v "" $2 \
 $(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.