X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/74180153dc4fd82fe3a5e0e0a767a3530c8a7235..69bbb181a3b0ca12644af37a61e350bf6a064a16:/Makefile

diff --git a/Makefile b/Makefile
index eb0ccff..d4b3669 100644
--- 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,24 @@ 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_all_ZONES	+= distorted.org.uk
 distorted_all_ZONES	+= 199.29.172.in-addr.arpa
 
 ###--------------------------------------------------------------------------
-### The harlequin.org.uk zones.
-
-ZONESETS		+= harlequin
-
-harlequin_VIEWS		 = inside outside
-harlequin_outside_NETS	 = dmz
-harlequin_inside_NETS	 = unsafe
-
-harlequin_all_ZONES	 = harlequin.org.uk
-
-###--------------------------------------------------------------------------
-### 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
+
+## odin.gg
+ZONESETS		+= odin
+odin_VIEWS		 = outside
+odin_all_ZONES		 = odin.gg
 
 ###--------------------------------------------------------------------------
 ### Zone construction machinery.