harlequin: Add new service patchwork for blog.

Alas, this involves adding harlequin to the split-horizon-doom-thing.

diff --git a/Makefile.m4 b/Makefile.m4
index 3758d4a333bcf3ff1a4dd1cf9d36e84f364ad050..a39acaef031f67946dae05b94f4d797a042f22d3 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -38,7 +38,7 @@ DOMAIN([distorted], [inet, fretwank],
        [distorted.org.uk, dhcp.distorted.org.uk,
         198.29.172.in-addr.arpa, wireless.198.29.172.in-addr.arpa,
         199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])
        [distorted.org.uk, dhcp.distorted.org.uk,
         198.29.172.in-addr.arpa, wireless.198.29.172.in-addr.arpa,
         199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])

-DOMAIN([harlequin], [inet], [harlequin.org.uk])
+DOMAIN([harlequin], [inet, fretwank], [harlequin.org.uk])

 
 m4_divert(0)
 ###--------------------------------------------------------------------------
 
 m4_divert(0)
 ###--------------------------------------------------------------------------

diff --git a/harlequin.lisp b/harlequin.lisp
index 08e8f30500fa1983752ec2d2924f0fdff7f62164..076bcbe0ea48b5e5c7bd89c5123c4c32d082e697 100644 (file)
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -3,7 +3,16 @@
 (load "hosts" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 (load "hosts" :verbose nil)
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")

-(setf *default-zone-source* 'guvnor.distorted.org.uk.)
+
+(preferred-subnet-case
+  (fretwank
+   (setf *default-zone-source* 'metalzone.distorted.org.uk.)
+   (defhost mail metalzone)
+   (defhost bloghost vampire))
+  (t
+   (setf *default-zone-source* 'guvnor.distorted.org.uk.)
+   (defhost mail guvnor.demon)
+   (defhost bloghost guvnor.demon)))

 
 (defzone harlequin.org.uk
   ;;
 
 (defzone harlequin.org.uk
   ;;


@@ -13,7 +22,12 @@ (defzone harlequin.org.uk
        ns1.blackcatnetworks.co.uk.)
   ;;
   ;; Mail servers
        ns1.blackcatnetworks.co.uk.)
   ;;
   ;; Mail servers

-  :mx ((mail :ip guvnor.demon))
+  :mx ((mail :ip mail))
+  :srv ((:smtp mail))

   ;;
   ;; Web service
   ;;
   ;; Web service

-  ((@ www) :a boyle.nsict.org))
+  ((@ www) :svc boyle.nsict.org)
+  :srv ((:http www))
+  ;;
+  ;; Web log (currently local)
+  (patchwork :svc bloghost))