distorted.lisp: Include the correct TLSA record details for SMTP.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index 9128104a25259a0f44906a6238b5e1fe49a18a95..f6a075fbd11ea06391819fa4cafa6e78ff5f4e1a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,18 +63,22 @@ ZONESETS            += distorted
 
 distorted_VIEWS                 = inside outside
 distorted_outside_NETS  = dmz jump
-distorted_inside_NETS   = any unsafe colo vpn
+distorted_inside_NETS   = any unsafe colo vpn upn
 
 distorted_all_ZONES    += distorted.org.uk
 
-distorted_all_ZONES    += 199.29.172.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.198.13.212.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    += 199.29.172.in-addr.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    += 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_outside_NSDIFF = -sradius.dmz.distorted.org.uk
+
 ###--------------------------------------------------------------------------
 ### Other zones.
 
@@ -84,6 +88,11 @@ binswood_VIEWS                = outside
 binswood_all_ZONES     += binswood.org.uk
 binswood_all_ZONES     += 27.165.10.in-addr.arpa
 
+## escorted.org.uk
+ZONESETS               += escorted
+escorted_VIEWS          = outside
+escorted_all_ZONES     += escorted.org.uk
+
 ## odin.gg
 ZONESETS               += odin
 odin_VIEWS              = outside
@@ -123,6 +132,12 @@ $(foreach s,$(ZONESETS), \
     $(foreach z,$($s_all_ZONES) $($s_$v_ZONES), \
       $(eval $v/$z.zone: $v/$s.zonestamp))))
 
+## Prepare a mapping from zone names back to their owning zonesets.
+$(foreach s,$(ZONESETS), \
+  $(foreach z,$(sort $(foreach v,$($s_VIEWS), \
+       $($s_all_ZONES) $($s_$v_ZONES))), \
+    $(eval $z_ZONESET = $s)))
+
 ## Now we have to check the individual zone files.
 ALL_ZONECHECKS = $(foreach s,$(ZONESETS), \
        $(foreach v,$($s_VIEWS), \
@@ -135,6 +150,21 @@ $(ALL_ZONECHECKS) : %.check : %.zone
 check: $(ALL_ZONECHECKS)
 .PHONY: check $(ALL_ZONECHECKS)
 
+## If nsdiff(1) is available then we can show what changes we will make if
+## we install the new zone files.
+ALL_ZONEDIFFS = $(foreach s,$(ZONESETS), \
+       $(foreach v,$($s_VIEWS), \
+         $(foreach z,$($s_all_ZONES) $($s_$v_ZONES), \
+           $v/$z.zonediff)))
+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 $$rc ;; esac
+diff: $(ALL_ZONEDIFFS)
+
 ## Finally we have to install the zone files.
 ALL_INSTALLS = $(foreach s,$(ZONESETS), \
        $(foreach v,$($s_VIEWS), \