X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/2ed695e4e75e9a6bc126ddd7402a34217e187d70..49c5f8ff3e83562a6a9bc28397fc5673602b51c4:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index a6e03ec..acf66c6 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -97,13 +97,18 @@ (defzone distorted.org.uk
   ;; Colocated services.
   (irc (colo :svc jazz.colo)
        (jump :svc jazz.jump))
-  (git (colo :svc stratocaster.colo)
-       (jump :svc stratocaster.jump))
+  ((git www) (colo :svc stratocaster.colo)
+	     (jump :svc stratocaster.jump))
+  :svc #+view/inside stratocaster.colo
+       #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo)
 
   ;; Local services.
-  ((rawk) :svc artist)
-  ((@ www ftp rsync wiki bugs mail db i2p vox) :svc vampire)
+  (rawk (unsafe :svc artist.unsafe)
+        (dmz :svc artist.dmz))
+  (pifi (vpn :svc orange.vpn)
+	(dmz :svc artist.dmz))
+  ((ftp rsync wiki bugs mail db i2p vox) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
@@ -183,6 +188,9 @@ (defzone distorted.org.uk
   (dhcp :ns ((radius.ns.dhcp :ip radius)
 	     (precision.ns.dhcp :ip precision)
 	     (vampire.ns.dhcp :ip vampire)))
+  (dyn :ns ((radius.ns.dyn :ip radius)
+	    (precision.ns.dyn :ip precision)
+	    (vampire.ns.dyn :ip vampire)))
   (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
 	       (precision.ns.dnserr :ip precision.jump)
 	       (vampire.ns.dnserr :ip vampire.dmz)))