$NetBSD: patch-ad,v 1.4 2009/08/21 02:28:13 schnoebe Exp $

--- etc/s2s.xml.in.orig	2009-07-05 16:54:18.000000000 -0500
+++ etc/s2s.xml.in
@@ -5,7 +5,7 @@
 
   <!-- The process ID file. Comment this out if you don't need to know
        the process ID from outside the process (eg for control scripts) -->
-  <pidfile>@localstatedir@/jabberd/pid/s2s.pid</pidfile>
+  <pidfile>@PIDDIR@/s2s.pid</pidfile>
 
   <!-- Router connection configuration -->
   <router>
@@ -37,7 +37,7 @@
          If this is commented out, or the file can't be read, no attempt
          will be made to establish an encrypted channel with the router. -->
     <!--
-    <pemfile>@sysconfdir@/server.pem</pemfile>
+    <pemfile>@SSLCERTS@/server.pem</pemfile>
     -->
 
     <!-- Router connection retry -->
@@ -70,7 +70,7 @@
 
     <!-- if logging to file, this is the filename of the logfile -->
     <!--
-    <file>@localstatedir@/jabberd/log/s2s.log</file>
+    <file>@LOGDIR@/s2s.log</file>
     -->
   </log>
 
@@ -106,7 +106,7 @@
          If this is commented out, or the file can't be read, no attempt will be
          made to establish encrypted connections with other servers. -->
     <!--
-    <pemfile>@sysconfdir@/server.pem</pemfile>
+    <pemfile>@SSLCERTS@/server.pem</pemfile>
     -->
 
     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
@@ -117,7 +117,7 @@
     <!-- File containing an optional SSL certificate chain file for SSL
          connections. -->
     <!--
-    <cachain>@sysconfdir@/cachain.pem</cachain>
+    <cachain>@SSLCERTS@/cachain.pem</cachain>
     -->
 
   </local>
@@ -227,7 +227,7 @@
   <stats>
     <!-- file containing count of packets that went through -->
     <!--
-    <packet>@localstatedir@/jabberd/stats/s2s.packets</packet>
+    <packet>@LOGDIR@/jabberd.s2s.packets</packet>
     -->
   </stats>