distorted.lisp: Reorganize services.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 9d81567d4a8de7568449d3b5ed6130defa793642..44ba08f5fceda2c5c34ce4441599f36822f26cf0 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -103,16 +103,13 @@ (defzone distorted.org.uk
   ;;
   ;; Local services.
   (@ :svc www-frontend)
-  ((www ftp wiki git bugs mail)
-   (inet :svc guvnor.demon)
-   (fretwank :svc metalzone))
-  ((db tor i2p rawk vox www-cache)
+  ((www ftp wiki git bugs mail db tor i2p rawk vox www-cache)
    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
   ;;
   ;; Internal services.
-  ((ntp1) (fretwank :svc metalzone))
-  ((wpad ntp news) (fretwank :svc vampire))
+  ((ntp) (fretwank :svc ibanez))
+  ((wpad ntp1 news) (fretwank :svc vampire))
   ;;
   ;; Wired ethernet.
   (fretwank :net fretwank)