Makefile, hosts.lisp, distorted.lisp: Move `fender' home.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index b02ae4e..66c3f46 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -33,7 +33,6 @@
       (dhcp "32/27"))
     (vpn "128/27")
     (its "160/30")
-    (colo "176/28")
     (safe "192/27")
     (any "224/27")))
 
@@ -44,20 +43,11 @@
 (defnet distorted.org.uk-aaisp "2001:8b0:c92/48"
   (unsafe "1/64"
     (dhcp "6468:6370/96"))
-  (nany "0/64")
+  (any "0/64")
   (dmz "fff/64")
   (safe "4001/64")
-  (nvpn "6000/64")
-  (untrusted "8001/64")
-  (nupn "a000/64"))
-
-;; Externally routed colo range.
-(defnet jump "212.13.198.66/28")
-(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")
+  (untrusted "8001/64")
   (upn "a000/64"))
 
 ;;;--------------------------------------------------------------------------
@@ -75,18 +65,6 @@
 (defhost anon.dmz (dmz 12))
 (defhost nat.dmz ((:ipv4 dmz 14)))
 
-;; Colocated addresses.
-(defhost gate.jump ((:ipv6 jump 2)))
-(defhost fender.jump (jump 5))
-(defhost precision.jump (jump 6))
-(defhost telecaster.jump (jump 7))
-(defhost stratocaster.jump (jump 8))
-(defhost jazz.jump (jump 9))
-(defhost marshall.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")))
-
 ;; Formerly colocated addresses.
 (defhost precision.dmz ((:ipv4 dmz1 1) (:ipv6 dmz 33)))
 (defhost telecaster.dmz ((:ipv4 dmz1 2) (:ipv6 dmz 34)))
@@ -155,23 +133,10 @@
 (defhost spirit.vpn ((:ipv4 vpn 9) (:ipv6 vpn "::9:1")))
 (defhost groove.vpn ((:ipv4 vpn 10) (:ipv6 vpn "::10:1")))
 
-(defhost crybaby.nvpn ((:ipv6 nvpn "::1:1")))
-(defhost orange.nvpn ((:ipv6 nvpn "::3:1")))
-(defhost haze.nvpn ((:ipv6 nvpn "::4:1")))
-(defhost radius.nvpn ((:ipv6 nvpn "::5:1")))
-(defhost precision.nvpn ((:ipv6 nvpn "::6:1")))
-(defhost jazz.nvpn ((:ipv6 nvpn "::7:1")))
-(defhost vampire.nvpn ((:ipv6 nvpn "::8:1")))
-(defhost spirit.nvpn ((:ipv6 nvpn "::9:1")))
-(defhost groove.nvpn ((:ipv6 nvpn "::10:1")))
-
 ;; Untrusted private network.
 (defhost national.upn ((:ipv4 upn 1) (:ipv6 upn "::1:1")))
 (defhost mdwdev.upn ((:ipv4 upn 2) (:ipv6 upn "::2:1")))
 
-(defhost national.nupn ((:ipv6 nupn "::1:1")))
-(defhost mdwdev.nupn ((:ipv6 nupn "::2:1")))
-
 ;; Iodine network.
 (defhost jazz.iodine (iodine 1))
 
@@ -185,13 +150,6 @@
 (defhost gw.its (its 1))
 (defhost mz.its (its 2))
 
-;; Internal (VPN) addresses for colocated services.
-(defhost fender.colo (colo 1))
-(defhost precision.colo (colo 2))
-(defhost telecaster.colo (colo 3))
-(defhost stratocaster.colo (colo 4))
-(defhost jazz.colo (colo 5))
-
 ;; Anycast addresses for services.
 (defhost dns0.any ((:ipv4 any 0) (:ipv6 any "::0:1")))
 (defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:1")))
@@ -201,34 +159,26 @@
 (defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:1")))
 (defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:1")))
 
-(defhost dns0.nany ((:ipv6 nany "::0:1")))
-(defhost dns1.nany ((:ipv6 nany "::1:1")))
-(defhost ntp0.nany ((:ipv6 nany "::2:1")))
-(defhost ntp1.nany ((:ipv6 nany "::3:1")))
-(defhost www-cache.nany ((:ipv6 nany "::4:1")))
-(defhost krb0.nany ((:ipv6 nany "::5:1")))
-(defhost krb1.nany ((:ipv6 nany "::6:1")))
-
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 (preferred-subnet-case
-  ((unsafe colo)
+  (unsafe
    (defhost radius radius.unsafe)
    (defhost vampire vampire.unsafe)
-   (defhost precision precision.colo)
-   (defhost telecaster telecaster.colo)
-   (defhost stratocaster stratocaster.colo)
+   (defhost precision precision.unsafe)
+   (defhost telecaster telecaster.unsafe)
+   (defhost stratocaster stratocaster.unsafe)
    (defhost national national.upn))
   (t
    (defhost radius radius.dmz)
    (defhost vampire vampire.dmz)
-   (defhost precision precision.jump)
-   (defhost telecaster telecaster.jump)
-   (defhost stratocaster stratocaster.jump)
+   (defhost precision precision.dmz)
+   (defhost telecaster telecaster.dmz)
+   (defhost stratocaster stratocaster.dmz)
    (defhost national national.linode)))
 
-(defhost marshall marshall.jump)
+(defhost marshall marshall.dmz)
 (defhost mdwdev mdwdev.upn)
 
 ;;;----- That's all, folks --------------------------------------------------