Makefile, distorted.lisp, hosts.lisp: Finish renumbering for A&A switchover.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index 6c6a9df..69d62e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,19 +63,18 @@ 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    += 144-159.204.49.62.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    += 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    += 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
@@ -168,7 +167,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.