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

diff --git a/Makefile b/Makefile
index 89e15a3951b8c7bcc900e64db5a7f5d43fa4f449..6c4427f78972f4eb7dacd4f9ce288fb3318bb41e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ ZONESETS              += distorted
 
 distorted_VIEWS                 = inside outside
 distorted_outside_NETS  = dmz jump
 
 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    += distorted.org.uk
 

diff --git a/hosts.lisp b/hosts.lisp
index 0b2818504c9337850ae95592c4ecc04e8ce35d54..845e9698e56fa9e34e2ced59da6326705071d7bd 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -22,7 +22,8 @@ (defhost gandi-ns6 ((:ipv4 "217.70.177.40")))
 (defnet distorted.org.uk "172.29.198/23"
   (untrusted "198.0/24"
     (wireless "0/25")
 (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")
   (trusted "199.0/24"
     (wired "0/25"
       (unsafe "0/27")


@@ -42,7 +43,8 @@ (defnet jump "2001:ba8:0:1d9/64")
 (defnet distorted.org.uk-jump "2001:ba8:1d9/48"
   (colo "2/64")
   (any "0/64")
 (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")
 
 ;; Hurricane Electric IPv6-inIPv4 tunnel.
 (defnet he-tunnel "2001:470:1f08:1b98/64")