X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/c1b134c3e060f10a76b953c42d4f47d1fbf8bcc6..b30cc2156fad9cefea07fca2697c0bee69f837de:/distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 0a5aba4..ddeb6ff 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -26,6 +26,7 @@
 
   ;; Mail servers.
   ((@ mail lists bugs cryptomail)
+   :ttl 300
    :mx mail
    :srv ((:smtp mail)))
 
@@ -84,8 +85,7 @@
 
   ;; Entry is via little router box.
   (dmz :net dmz)
-  (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
-  (anon (dmz :a anon.dmz))
+  (guvnor (dmz :a guvnor.dmz))
   (gate (dmz :a gate.dmz))
   (nat (dmz :a nat.dmz))
 
@@ -95,8 +95,8 @@
   (evolution :alias evo)
 
   ;; Colocated services.
-  (irc (colo :svc jazz.colo)
-       (jump :svc jazz.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
@@ -106,15 +106,18 @@
   ;; Local services.
   (rawk (unsafe :svc artist.unsafe)
         (dmz :svc artist.dmz))
-  (pifi (vpn :svc orange.vpn))
-  ((ftp rsync wiki bugs mail db i2p vox) :svc vampire)
+  (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)
 
   ;; Anonymity services.
-  (tor :svc #+view/inside vampire.unsafe
-	    #-view/inside anon.dmz)
+  (anon (colo :svc jazz.colo)
+        (unsafe :svc vampire.unsafe)
+        (jump :a anon.jump)
+	(dmz :a anon.dmz))
 
   ;; Fancy connectivity.
   (iodine (jump :a jazz.jump))
@@ -136,6 +139,9 @@
 	(jump :a jazz.jump)
 	(iodine :a jazz.iodine))
 
+  ;; Media server (on loan to Good Technology HSTG).
+  (jaguar (jump :a jaguar.jump))
+
   ;; Nicko's server.
   (richmond (jump :a richmond.jump))
 
@@ -158,7 +164,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)
@@ -172,7 +179,6 @@
   (crybaby (vpn :a crybaby.vpn))
   (terror (vpn :a terror.vpn))
   (orange (vpn :a orange.vpn))
-  (mango (vpn :a mango.vpn))
   (iodine :net iodine)
 
   ;; ITS.
@@ -187,6 +193,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)))