hosts.lisp, distorted.lisp: artist is on the untrusted network.

[zones] / Makefile

diff --git a/Makefile b/Makefile
index 3f90a79b115749a9a683e696e231e206633b9ab4..eda4119623a1f48c3ba76453e5cf92f8e3204ed7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ CHECKZONE              = named-checkzone -i full \
 
 ## Zone installation.
 MASTER                  = localhost
+inside_MASTER           = precision
+
+
 ifeq ($(MASTER),localhost)
 ZONEINST                = userv zoneconf install
 else
@@ -60,34 +63,31 @@ ZONESETS             =
 ZONESETS               += distorted
 
 distorted_VIEWS                 = inside outside
-distorted_outside_NETS  = dmz
-distorted_inside_NETS   = unsafe
+distorted_outside_NETS  = dmz jump
+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
+distorted_all_ZONES    += 199.29.172.in-addr.arpa
 
 ###--------------------------------------------------------------------------
-### The harlequin.org.uk zones.
+### Other zones.
 
+## harlequin.org.uk
 ZONESETS               += harlequin
-
-harlequin_VIEWS                 = inside outside
-harlequin_outside_NETS  = dmz
-harlequin_inside_NETS   = unsafe
-
+harlequin_VIEWS                 = outside
 harlequin_all_ZONES     = harlequin.org.uk
 
-###--------------------------------------------------------------------------
-### The felixpearce.com zones.
-
+## felixpearce.com
 ZONESETS               += felixpearce
-
-felixpearce_VIEWS       = inside outside
-felixpearce_outside_NETS = dmz
-felixpearce_inside_NETS         = unsafe
-
+felixpearce_VIEWS       = outside
 felixpearce_all_ZONES   = felixpearce.com
 
+## binswood.org.uk
+ZONESETS               += binswood
+binswood_VIEWS          = outside
+binswood_all_ZONES     += binswood.org.uk
+binswood_all_ZONES     += 27.165.10.in-addr.arpa
+
 ###--------------------------------------------------------------------------
 ### Zone construction machinery.