New virtual server: universe.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 0b2818504c9337850ae95592c4ecc04e8ce35d54..8576a0bdb4b6767033db76bacb3c6fd104b4e0ef 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")
-    (iodine "128/28"))
+    (iodine "128/28")
+    (upn "160/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")
-  (vpn "6000/64"))
+  (vpn "6000/64")
+  (upn "a000/64"))
 
 ;; Hurricane Electric IPv6-inIPv4 tunnel.
 (defnet he-tunnel "2001:470:1f08:1b98/64")
@@ -62,6 +64,7 @@ (defhost roadstar.dmz (dmz 3))
 (defhost jem.dmz (dmz 4))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
+(defhost universe.dmz (dmz 7))
 (defhost ibanez.dmz (dmz 9))
 (defhost anon.dmz (dmz 12))
 (defhost nat.dmz ((:ipv4 dmz 14)))
@@ -78,12 +81,17 @@ (defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
 (defhost anon.jump (jump 13))
 (defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
 
+;; Linode virtual hosts.
+(defhost national.linode ((:ipv4 "45.33.118.239")
+                         (:ipv6 "2600:3c00::f03c:91ff:fe3b:d7c1")))
+
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
 (defhost roadstar.unsafe (unsafe 2))
 (defhost jem.unsafe (unsafe 3))
 (defhost artist.unsafe (unsafe 4))
 (defhost vampire.unsafe (unsafe 5))
+(defhost universe.unsafe (unsafe 6))
 (defhost ibanez.unsafe (unsafe 14))
 (defhost groove.unsafe (unsafe 17))
 
@@ -119,6 +127,9 @@ (defhost precision.vpn ((:ipv4 vpn 6) (:ipv6 vpn "::6:1")))
 (defhost jazz.vpn ((:ipv4 vpn 7) (:ipv6 vpn "::7:1")))
 (defhost vampire.vpn ((:ipv4 vpn 8) (:ipv6 vpn "::8:1")))
 
+;; Untrusted private network.
+(defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
+
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))