hosts.lisp, distorted.org.uk: New VPN host `haze'.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 28dd2bf41726f03198bbec29979d1acd52a62a89..e48dbb32ec8995341ad99320616fc33f750c4f39 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -73,8 +73,8 @@ (defhost precision.jump (jump 6))
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
-(defhost jaguar.jump ((:ipv4 jump 11)))
-(defhost richmond.jump ((:ipv4 jump 12)))
+(defhost jaguar.jump ((:ipv4 jump 11) (:ipv6 jump "::2:1")))
+(defhost richmond.jump ((:ipv4 jump 12) (:ipv6 jump "::1:1")))
 (defhost anon.jump (jump 13))
 (defhost blackhole.jump ((:ipv4 jump 14) (:ipv6 jump "::ffff")))
 
@@ -103,9 +103,10 @@ (defhost artist.untrusted (untrusted 2))
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
-(defhost crybaby.vpn ((:ipv4 vpn 1) (:ipv6 vpn "::1:0")))
+(defhost crybaby.vpn ((:ipv4 vpn 1) (:ipv6 vpn "::1:1")))
 (defhost terror.vpn ((:ipv4 vpn 2)))
-(defhost orange.vpn ((:ipv4 vpn 3) (:ipv6 vpn "::3:0")))
+(defhost orange.vpn ((:ipv4 vpn 3) (:ipv6 vpn "::3:1")))
+(defhost haze.vpn ((:ipv4 vpn 4) (:ipv6 vpn "::4:1")))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -123,13 +124,13 @@ (defhost stratocaster.colo (colo 4))
 (defhost jazz.colo (colo 5))
 
 ;; Anycast addresses for services.
-(defhost dns0.any ((:ipv4 any 0) (:ipv6 any "::0:0")))
-(defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:0")))
-(defhost ntp0.any ((:ipv4 any 2) (:ipv6 any "::2:0")))
-(defhost ntp1.any ((:ipv4 any 3) (:ipv6 any "::3:0")))
-(defhost www-cache.any ((:ipv4 any 4) (:ipv6 any "::4:0")))
-(defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:0")))
-(defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:0")))
+(defhost dns0.any ((:ipv4 any 0) (:ipv6 any "::0:1")))
+(defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:1")))
+(defhost ntp0.any ((:ipv4 any 2) (:ipv6 any "::2:1")))
+(defhost ntp1.any ((:ipv4 any 3) (:ipv6 any "::3:1")))
+(defhost www-cache.any ((:ipv4 any 4) (:ipv6 any "::4:1")))
+(defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:1")))
+(defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:1")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.