distorded.lisp: Move lpr service to roadstar.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 59a3768eabd6c3037bf54bc728b55e89d7912d42..1501e72fa0a8862e4cd021b16e400750ae86dc3f 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -161,7 +161,7 @@ (defzone distorted.org.uk
                                      #p"https-stratocaster")))
   (www-cache :tlsa (3127 #1=(:trust-anchor-assertion
                             :certificate :sha-256 #p"distorted-ca")))
-  (mail :tlsa ((:submission :imap :imaps) #1# #3#))
+  (mail :tlsa ((:submission :imap :imaps) #1#))
   (mail :tlsa (:smtp
               #+view/inside #1#
               #-view/inside (:domain-issued-certificate
@@ -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,23 +229,29 @@ (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)
   (guvnor (dmz :addr guvnor.dmz))
   (nat (dmz :addr nat.dmz))
 
-  ;; Wireless gateway.
+  ;; Wireless access points.
   (wireless :net wireless)
   (evolution (safe :addr evolution.safe))
   (evolution :alias evo)
+  (kitkat :alias ap0)
+  (kitkat (safe :addr kitkat.safe))
+  (lunch :alias ap1)
+  (lunch (safe :addr lunch.safe))
+
+  ;; Printer.
+  (burntaxe :alias lp0)
+  (burntaxe (safe :addr burntaxe.safe))
 
   ;; Switches.
   (grigsby :alias tp0)
@@ -308,6 +314,8 @@ (defzone distorted.org.uk
   (crybaby :abbrev cb)
   (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby")
           (hippo :addr crybaby.hippo :sshfp "crybaby"))
+  (spirit (vpn :addr spirit.vpn :sshfp "spirit")
+         (hippo :addr spirit.hippo :sshfp "spirit"))
   (terror (vpn :addr terror.vpn :sshfp "terror"))
   (orange :abbrev o)
   (orange (vpn :addr orange.vpn :sshfp "orange"))
@@ -370,6 +378,7 @@ (defzone dhcp.distorted.org.uk
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
   (gretsch :addr gretsch.unsafe)
+  (spirit :addr spirit.unsafe)
   (haze :addr haze.unsafe)
   (invader :addr invader.safe)
   (marauder :addr marauder.safe))