From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 16 Mar 2008 15:46:31 +0000 (+0000)
Subject: harlequin: Add new service patchwork for blog.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/01329f4e62e0170f1f9fe68f4864bb171a6a6bec?ds=sidebyside

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 3758d4a..a39acae 100644
--- 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])
-DOMAIN([harlequin], [inet], [harlequin.org.uk])
+DOMAIN([harlequin], [inet, fretwank], [harlequin.org.uk])
 
 m4_divert(0)
 ###--------------------------------------------------------------------------
diff --git a/harlequin.lisp b/harlequin.lisp
index 08e8f30..076bcbe 100644
--- a/harlequin.lisp
+++ b/harlequin.lisp
@@ -3,7 +3,16 @@
 (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
   ;;
@@ -13,7 +22,12 @@ (defzone harlequin.org.uk
        ns1.blackcatnetworks.co.uk.)
   ;;
   ;; Mail servers
-  :mx ((mail :ip guvnor.demon))
+  :mx ((mail :ip mail))
+  :srv ((:smtp mail))
   ;;
   ;; Web service
-  ((@ www) :a boyle.nsict.org))
+  ((@ www) :svc boyle.nsict.org)
+  :srv ((:http www))
+  ;;
+  ;; Web log (currently local)
+  (patchwork :svc bloghost))