From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 1 Oct 2015 07:06:44 +0000 (+0100)
Subject: Makefile, hosts.lisp: New network for untrusted hosts on the VPN.
X-Git-Url: https://git.distorted.org.uk/~mdw/zones/commitdiff_plain/9e4bef7991ca1373213e0c3260bf542d52e5a5c4

Makefile, hosts.lisp: New network for untrusted hosts on the VPN.
---

diff --git a/Makefile b/Makefile
index 89e15a3..6c4427f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ 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
 
diff --git a/hosts.lisp b/hosts.lisp
index 0b28185..845e969 100644
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -22,7 +22,8 @@
 (defnet distorted.org.uk "172.29.198/23"
   (untrusted "198.0/24"
     (wireless "0/25")
-    (iodine "128/28"))
+    (iodine "128/28")
+    (upn "160/27"))
   (trusted "199.0/24"
     (wired "0/25"
       (unsafe "0/27")
@@ -42,7 +43,8 @@
 (defnet distorted.org.uk-jump "2001:ba8:1d9/48"
   (colo "2/64")
   (any "0/64")
-  (vpn "6000/64"))
+  (vpn "6000/64")
+  (upn "a000/64"))
 
 ;; Hurricane Electric IPv6-inIPv4 tunnel.
 (defnet he-tunnel "2001:470:1f08:1b98/64")