hosts.lisp, distorted.lisp: Move anonymity services to jazz.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index 6cb5a9c..9e3cabf 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -58,6 +58,7 @@
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
 (defhost richmond.jump (jump 12))
+(defhost anon.jump (jump 13))
 (defhost blackhole.jump (jump 14))
 
 ;; Unsafe network.
@@ -75,14 +76,13 @@
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
-(defhost evolution.untrusted (untrusted 2))
+(defhost artist.untrusted (untrusted 2))
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
 (defhost crybaby.vpn (vpn 1))
 (defhost terror.vpn (vpn 2))
 (defhost orange.vpn (vpn 3))
-(defhost mango.vpn (vpn 4))
 
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
@@ -109,16 +109,6 @@
 (defhost krb1.any (any 6))
 
 ;;;--------------------------------------------------------------------------
-;;; Satellite networks.
-
-;; Binswood.  Address range retroactively claimed from Cambridge G-RIN.
-(defnet binswood.org.uk 10.165.27.0/24
-  (binswood 256))
-(defhost netgear.binswood (binswood 1))
-(defhost linksys.binswood (binswood 2))
-(defhost mango.binswood (binswood 3))
-
-;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 (preferred-subnet-case