X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/345c0f698db1a02fe4e9b5ad8d1d711ba1aeb8f2..8dcb37002e1a38b33e38c71001ef74e0163852f9:/hosts.lisp diff --git a/hosts.lisp b/hosts.lisp index b7fc5e5..6cb5a9c 100644 --- a/hosts.lisp +++ b/hosts.lisp @@ -57,6 +57,8 @@ (defhost telecaster.jump (jump 7)) (defhost stratocaster.jump (jump 8)) (defhost jazz.jump (jump 9)) +(defhost richmond.jump (jump 12)) +(defhost blackhole.jump (jump 14)) ;; Unsafe network. (defhost radius.unsafe (unsafe 1)) @@ -79,9 +81,11 @@ ;; 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 vampire.iodine (iodine 1)) +(defhost jazz.iodine (iodine 1)) ;; Special network for ITS. ;; It doesn't understand point-to-point links, so we need a little net. @@ -101,16 +105,32 @@ (defhost ntp0.any (any 2)) (defhost ntp1.any (any 3)) (defhost www-cache.any (any 4)) +(defhost krb0.any (any 5)) +(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 - (dmz - (defhost radius radius.dmz) - (defhost vampire vampire.dmz)) - (t + ((unsafe colo) (defhost radius radius.unsafe) - (defhost vampire vampire.unsafe))) + (defhost precision precision.colo) + (defhost stratocaster stratocaster.colo) + (defhost vampire vampire.unsafe)) + (t + (defhost radius radius.dmz) + (defhost precision precision.jump) + (defhost stratocaster stratocaster.jump) + (defhost vampire vampire.dmz))) ;;;----- That's all, folks --------------------------------------------------