distorded.lisp: Move lpr service to roadstar.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a0493dc3da14478d5e39c461e8d0d97ebdf31375..1501e72fa0a8862e4cd021b16e400750ae86dc3f 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -185,7 +185,7 @@ (defzone distorted.org.uk
          (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
 
   ;; Internal services.
-  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
+  #+view/inside ((news lpr) :svc roadstar.unsafe :sshfp "roadstar")
 
   ;; Anonymity services.
   (anon (colo :svc jazz.colo)
@@ -229,13 +229,11 @@ (defzone distorted.org.uk
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
   (national (linode :addr national.linode)
            (upn :addr national.upn))
+  (mdwdev (upn :addr mdwdev.upn))
 
-  ;; Media server (on loan to Good Technology HSTG).
-  (jaguar :abbrev jag)
-  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
-
-  ;; Nicko's server.
+  ;; Nicko's servers.
   (richmond (jump :svc richmond.jump))
+  (marshall (jump :svc marshall.jump))
 
   ;; Entry is via little router box.
   (dmz :net dmz)
@@ -252,6 +250,7 @@ (defzone distorted.org.uk
   (lunch (safe :addr lunch.safe))
 
   ;; Printer.
+  (burntaxe :alias lp0)
   (burntaxe (safe :addr burntaxe.safe))
 
   ;; Switches.