Reformatting.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 55cf7839ade7be00ddd2f61f0c5eb14d5a49deff..98a3136b0121769e98c38bf35a2dd01a6e16a363 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -43,13 +43,11 @@    (defhost www-frontend guvnor.demon)))
 (defzone distorted.org.uk
   ;;
   ;; Nameservers
-  :ns #+subnet/fretwank
-      ((metalzone.ns :ip metalzone)
-       (vampire.ns :ip vampire))
-      #-subnet/fretwank
-      ((boyle.ns :ip boyle.nsict.org)
-       (chiark.ns :ip chiark.greenend.org.uk)
-       (guvnor.ns :ip guvnor.demon))
+  :ns #+subnet/fretwank ((metalzone.ns :ip metalzone)
+                        (vampire.ns :ip vampire))
+      #-subnet/fretwank ((boyle.ns :ip boyle.nsict.org)
+                        (chiark.ns :ip chiark.greenend.org.uk)
+                        (guvnor.ns :ip guvnor.demon))
   ;;
   ;; Mail servers
   ((@ mail lists bugs cryptomail) :mx mail)
@@ -65,13 +63,16 @@ (defzone distorted.org.uk
   ;;
   ;; 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))
+  ((db)
+   (inet :svc guvnor.demon)
+   (fretwank :svc vampire))
   ;;
   ;; 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))