distorted.lisp: Merge together some of the role address definitions.

This way, it's slightly easier to see which servers are providing which
services, and moving roles between servers is a fairly simple kill-and-
yank operation.

diff --git a/distorted.lisp b/distorted.lisp
index c4a3fe6212b0e855719b9676bdb2b3744f4e793c..20a64e0502a369bee84d7f6b03a50b510f186989 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -101,14 +101,13 @@ (defzone distorted.org.uk
   ((www ftp wiki git bugs mail)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
   ((www ftp wiki git bugs mail)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))

-  ((db tor i2p rawk)
+  ((db tor i2p rawk vox www-cache)

    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
    (inet :svc guvnor.demon)
    (fretwank :svc vampire))

-  (vox (inet :svc guvnor.demon) (fretwank :svc vampire))

   ;;
   ;; Internal services.
   ((ntp1) (fretwank :svc metalzone))
   ;;
   ;; Internal services.
   ((ntp1) (fretwank :svc metalzone))

-  ((www-cache wpad ntp news) (fretwank :svc vampire))
+  ((wpad ntp news) (fretwank :svc vampire))

   ;;
   ;; Wired ethernet.
   (fretwank :net fretwank)
   ;;
   ;; Wired ethernet.
   (fretwank :net fretwank)