X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/4ce0a99f34ca291c92247be00244ed27ff438a2a..827f2f1e9ebbaae1134a045abac8ea127614cb9f:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 03e545c..5f88295 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -95,15 +95,20 @@
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc jazz.colo)
-       (jump :svc jazz.jump))
-  (git (colo :svc stratocaster.colo)
-       (jump :svc stratocaster.jump))
+  ((irc vox) (colo :svc jazz.colo)
+	     (jump :svc jazz.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) :svc vampire)
 
   ;; Internal services.
   #+view/inside ((news lpr) :svc vampire.unsafe)
@@ -154,7 +159,8 @@
   (jem (unsafe :a jem.unsafe)
        (dmz :a jem.dmz))
   (artist (unsafe :a artist.unsafe)
-	  (dmz :a artist.dmz))
+	  (dmz :a artist.dmz)
+	  (untrusted :a artist.untrusted))
 
   ;; DHCP hosts.
   (gibson :cname gibson.dhcp)
@@ -167,6 +173,7 @@
   (vpn :net vpn)
   (crybaby (vpn :a crybaby.vpn))
   (terror (vpn :a terror.vpn))
+  (orange (vpn :a orange.vpn))
   (iodine :net iodine)
 
   ;; ITS.
@@ -181,6 +188,9 @@
   (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)))