harlequin: Add new service patchwork for blog.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 7cae689..6891e23 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -50,7 +50,13 @@
                         (guvnor.ns :ip guvnor.demon))
   ;;
   ;; Mail servers
-  ((@ mail lists bugs cryptomail) :mx mail)
+  ((@ mail lists bugs cryptomail)
+   :mx mail
+   :srv ((:smtp mail)))
+  ;;
+  ;; Other services
+  :srv ((:http www)
+       (:ftp ftp))
   ;;
   ;; Colocated services
   ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
@@ -100,7 +106,12 @@
 
 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  :reverse untrusted)
+  :reverse untrusted
+  #+subnet/fretwank (wireless :ns (metalzone.ns vampire.ns))
+  #+subnet/fretwank (@ :cidr-delegation
+                      (wireless
+                       (wireless
+                        198.29.172.wireless.198.29.172.in-addr.arpa))))
 
 (defzone dhcp.distorted.org.uk
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
@@ -108,3 +119,7 @@
 
 (defzone dhcp.199.29.172.in-addr.arpa
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire)))
+
+(defzone wireless.198.29.172.in-addr.arpa
+  :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
+  :reverse ((wireless :bytes 4)))