New service names: wiki, db, ntp{,1}, and wpad.

diff --git a/distorted.lisp b/distorted.lisp
index 55cf7839ade7be00ddd2f61f0c5eb14d5a49deff..3838871d3ec655dd7cd7d72750b8382c8c3d6296 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -65,13 +65,16 @@ (defzone distorted.org.uk
   ;;
   ;; Local services
   (@ :svc www-frontend)
   ;;
   ;; Local services
   (@ :svc www-frontend)

-  ((www ftp git bugs mail rawk)
+  ((www ftp wiki git bugs mail rawk)

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

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

   ;;
   ;; Internal services
   ;;
   ;; Internal services

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

   ;;
   ;; Wired ethernet
   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
   ;;
   ;; Wired ethernet
   (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))