1 diff -urNp -x '*.orig' jabberd-2.6.1.org/etc/c2s.xml.dist.in jabberd-2.6.1/etc/c2s.xml.dist.in
2 --- jabberd-2.6.1.org/etc/c2s.xml.dist.in 2016-10-09 11:47:52.000000000 +0200
3 +++ jabberd-2.6.1/etc/c2s.xml.dist.in 2021-10-06 23:07:15.380661414 +0200
6 <!-- The process ID file. Comment this out if you don't need to know
7 the process ID from outside the process (eg for control scripts) -->
8 - <pidfile>@localstatedir@/@package@/pid/${id}.pid</pidfile>
9 + <pidfile>@localstatedir@/run/jabber/${id}.pid</pidfile>
11 <!-- Router connection configuration -->
15 <!-- If logging to file, this is the filename of the logfile -->
17 - <file>@localstatedir@/@package@/log/c2s.log</file>
18 + <file>@localstatedir@/log/jabberd/c2s.log</file>
21 <!-- Filename of the debug logfile -->
23 - <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
24 + <debug>@localstatedir@/log/jabberd/debug-${id}.log</debug>
30 <!-- file containing count of packets that went through -->
32 - <packet>@localstatedir@/@package@/stats/c2s.packets</packet>
33 + <packet>@localstatedir@/lib/jabberd/stats/c2s.packets</packet>
38 <!-- SQLite driver configuration -->
40 <!-- Database name -->
41 - <dbname>@localstatedir@/@package@/db/sqlite.db</dbname>
42 + <dbname>@localstatedir@/lib/jabberd/sqlite.db</dbname>
44 <!-- Use this to pass any SQL statements to the database immediately
45 after opening it. This is typically used to set pragmas for
47 <!-- Berkeley DB module configuration -->
49 <!-- Directory to store database files under -->
50 - <path>@localstatedir@/@package@/db</path>
51 + <path>@localstatedir@/lib/jabberd/db</path>
53 <!-- Synchronize the database to disk after each write. If you
54 disable this, database accesses may be faster, but data may
55 diff -urNp -x '*.orig' jabberd-2.6.1.org/etc/jabberd.cfg.dist.in jabberd-2.6.1/etc/jabberd.cfg.dist.in
56 --- jabberd-2.6.1.org/etc/jabberd.cfg.dist.in 2016-05-04 00:25:09.000000000 +0200
57 +++ jabberd-2.6.1/etc/jabberd.cfg.dist.in 2021-10-06 23:07:15.380661414 +0200
60 @jabberd_router_bin@ @sysconfdir@/router.xml
61 @jabberd_sm_bin@ @sysconfdir@/sm.xml
62 -@jabberd_s2s_bin@ @sysconfdir@/s2s.xml
63 @jabberd_c2s_bin@ @sysconfdir@/c2s.xml
65 +# After sm and c2s are configured to use a fully qualified domain name
66 +# and proper SRV records are set in DNS uncoment this to enable communication
67 +# with other Jabber servers
68 +#@jabberd_s2s_bin@ @sysconfdir@/s2s.xml
69 diff -urNp -x '*.orig' jabberd-2.6.1.org/etc/router.xml.dist.in jabberd-2.6.1/etc/router.xml.dist.in
70 --- jabberd-2.6.1.org/etc/router.xml.dist.in 2016-05-04 00:25:09.000000000 +0200
71 +++ jabberd-2.6.1/etc/router.xml.dist.in 2021-10-06 23:07:15.380661414 +0200
74 <!-- The process ID file. Comment this out if you don't need to know
75 the process ID from outside the process (eg for control scripts) -->
76 - <pidfile>@localstatedir@/@package@/pid/${id}.pid</pidfile>
77 + <pidfile>@localstatedir@/run/jabber/${id}.pid</pidfile>
79 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
83 <!-- If logging to file, this is the filename of the logfile -->
85 - <file>@localstatedir@/@package@/log/router.log</file>
86 + <file>@localstatedir@/log/jabberd/router.log</file>
89 <!-- Filename of the debug logfile -->
91 - <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
92 + <debug>@localstatedir@/log/jabberd/debug-${id}.log</debug>
96 <!-- Local network configuration -->
98 - <!-- IP address to bind to (default: 0.0.0.0) -->
100 + <!-- IP address to bind to (default: 127.0.0.1) -->
103 <!-- Port to bind to (default: 5347) -->
107 <alias name='conference.domain.com' target='muclinker'/>
109 + <alias name='jud.localhost' target='jud-linker'/>
110 + <alias name='muc.localhost' target='muc-linker'/>
111 + <alias name='icq.localhost' target='icq-linker'/>
114 <!-- Access control information -->
115 diff -urNp -x '*.orig' jabberd-2.6.1.org/etc/s2s.xml.dist.in jabberd-2.6.1/etc/s2s.xml.dist.in
116 --- jabberd-2.6.1.org/etc/s2s.xml.dist.in 2016-05-04 00:25:09.000000000 +0200
117 +++ jabberd-2.6.1/etc/s2s.xml.dist.in 2021-10-06 23:07:15.380661414 +0200
120 <!-- The process ID file. Comment this out if you don't need to know
121 the process ID from outside the process (eg for control scripts) -->
122 - <pidfile>@localstatedir@/@package@/pid/${id}.pid</pidfile>
123 + <pidfile>@localstatedir@/run/jabber/${id}.pid</pidfile>
125 <!-- Router connection configuration -->
129 <!-- if logging to file, this is the filename of the logfile -->
131 - <file>@localstatedir@/@package@/log/s2s.log</file>
132 + <file>@localstatedir@/log/jabberd/s2s.log</file>
135 <!-- Filename of the debug logfile -->
137 - <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
138 + <debug>@localstatedir@/log/jabberd/debug-${id}.log</debug>
144 <!-- file containing count of packets that went through -->
146 - <packet>@localstatedir@/@package@/stats/s2s.packets</packet>
147 + <packet>@localstatedir@/lib/jabberd/stats/s2s.packets</packet>
151 diff -urNp -x '*.orig' jabberd-2.6.1.org/etc/sm.xml.dist.in jabberd-2.6.1/etc/sm.xml.dist.in
152 --- jabberd-2.6.1.org/etc/sm.xml.dist.in 2016-05-04 00:25:09.000000000 +0200
153 +++ jabberd-2.6.1/etc/sm.xml.dist.in 2021-10-06 23:07:15.380661414 +0200
156 <!-- The process ID file. Comment this out if you don't need to know
157 the process ID from outside the process (eg for control scripts) -->
158 - <pidfile>@localstatedir@/@package@/pid/${id}.pid</pidfile>
159 + <pidfile>@localstatedir@/run/jabber/${id}.pid</pidfile>
161 <!-- Router connection configuration -->
165 <!-- If logging to file, this is the filename of the logfile -->
167 - <file>@localstatedir@/@package@/log/sm.log</file>
168 + <file>@localstatedir@/log/jabberd/sm.log</file>
171 <!-- Filename of the debug logfile -->
173 - <debug>@localstatedir@/@package@/log/debug-${id}.log</debug>
174 + <debug>@localstatedir@/log/jabberd/debug-${id}.log</debug>
179 <!-- SQLite driver configuration -->
181 <!-- Database name -->
182 - <dbname>@localstatedir@/@package@/db/sqlite.db</dbname>
183 + <dbname>@localstatedir@/lib/jabberd/sqlite.db</dbname>
184 <!-- Use this to pass any SQL statements to the database immediately
185 after opening it. This is typically used to set pragmas for
186 performance tuning. -->
188 implementation does not implement the 'count' callback). -->
190 <!-- Directory to store database files under -->
191 - <path>@localstatedir@/@package@/db</path>
192 + <path>@localstatedir@/lib/jabberd/db</path>
194 <!-- Synchronize the database to disk after each write. If you
195 disable this, database accesses may be faster, but data may
204 <!-- User options -->