hosts.lisp, distorted.lisp: Proper assignments for colocated servers.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8325a9232825775446a184767db83e16af7a81b1..8327c8254ac8b4c2beadbce711a99efac404eabe 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -63,6 +63,22 @@ (defzone distorted.org.uk
   (tor :svc #+view/inside vampire.unsafe
            #-view/inside anon.dmz)
 
+  ;; Colocated hosts.
+  (colo :net colo)
+  (jump :net jump)
+  (fender (colo :a fender.colo)
+         (jump :a fender.jump))
+  (precision (colo :a precision.colo)
+            (jump :a precision.jump))
+  (telecaster (colo :a telecaster.colo)
+             (jump :a telecaster.jump))
+  (telecaster :alias tele)
+  (stratocaster (colo :a stratocaster.colo)
+               (jump :a stratocaster.jump))
+  (stratocaster :alias strat)
+  (jazz (colo :a jazz.colo)
+       (jump :a jazz.jump))
+
   ;; Wired ethernet.
   (wired :net wired)
   (vampire (unsafe :a vampire.unsafe)
@@ -120,6 +136,11 @@ (defrevzone dmz
        (vampire.ns :ip vampire))
   :reverse dmz)
 
+(defrevzone jump
+  :ns ((radius.ns :ip radius)
+       (vampire.ns :ip vampire))
+  :reverse jump)
+
 (defzone io.distorted.org.uk
   :ns ((ns :ip vampire))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))