distorted.lisp: DHCP CNAME for new host `gretsch'.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index 43c57e2f714fecd1eb59125c9cae1fe628ebce2f..882b08d36f2b05673814f44d6604383db27c1dc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,6 @@ CHECKZONE              = named-checkzone -i full \
 MASTER                  = localhost
 inside_MASTER           = precision
 
-
 ifeq ($(MASTER),localhost)
 ZONEINST                = userv zoneconf install
 else
@@ -64,32 +63,39 @@ ZONESETS            += distorted
 
 distorted_VIEWS                 = inside outside
 distorted_outside_NETS  = dmz jump
-distorted_inside_NETS   = unsafe colo
+distorted_inside_NETS   = any unsafe colo vpn
 
-distorted_all_ZONES     = distorted.org.uk io.distorted.org.uk
-distorted_inside_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
 
-ZONESETS               += harlequin
+distorted_all_ZONES    += 199.29.172.in-addr.arpa
 
-harlequin_VIEWS                 = inside outside
-harlequin_outside_NETS  = dmz
-harlequin_inside_NETS   = unsafe
+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
 
-harlequin_all_ZONES     = harlequin.org.uk
+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
 
 ###--------------------------------------------------------------------------
-### The felixpearce.com zones.
-
-ZONESETS               += felixpearce
-
-felixpearce_VIEWS       = inside outside
-felixpearce_outside_NETS = dmz
-felixpearce_inside_NETS         = unsafe
-
-felixpearce_all_ZONES   = felixpearce.com
+### 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
+
+## escorted.org.uk
+ZONESETS               += escorted
+escorted_VIEWS          = outside
+escorted_all_ZONES     += escorted.org.uk
+
+## odin.gg
+ZONESETS               += odin
+odin_VIEWS              = outside
+odin_all_ZONES          = odin.gg
 
 ###--------------------------------------------------------------------------
 ### Zone construction machinery.