head	1.12;
access;
symbols;
locks; strict;
comment	@# @;


1.12
date	2003.05.15.13.52.03;	author swiergot;	state Exp;
branches;
next	1.11;

1.11
date	2003.01.20.20.48.20;	author swiergot;	state Exp;
branches;
next	1.10;

1.10
date	2003.01.20.19.11.29;	author swiergot;	state Exp;
branches;
next	1.9;

1.9
date	2003.01.20.18.34.42;	author swiergot;	state Exp;
branches;
next	1.8;

1.8
date	2003.01.20.17.58.19;	author swiergot;	state Exp;
branches;
next	1.7;

1.7
date	2003.01.20.16.21.14;	author swiergot;	state Exp;
branches;
next	1.6;

1.6
date	2003.01.19.21.12.57;	author swiergot;	state Exp;
branches;
next	1.5;

1.5
date	2003.01.19.19.49.58;	author swiergot;	state Exp;
branches;
next	1.4;

1.4
date	2003.01.19.15.27.49;	author swiergot;	state Exp;
branches;
next	1.3;

1.3
date	2003.01.19.14.24.43;	author swiergot;	state Exp;
branches;
next	1.2;

1.2
date	2003.01.19.14.02.51;	author swiergot;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.18.23.54.46;	author swiergot;	state Exp;
branches;
next	;


desc
@@


1.12
log
@- Updated dirs patch to match the latest jabber-gg-transport.
@
text
@--- jabber.xml.orig	2001-05-15 17:21:56.000000000 +0200
+++ jabber.xml	2003-01-20 19:13:07.000000000 +0100
@@@@ -251,6 +251,24 @@@@
 
         end of <service/> examples -->
 
+	<!--
+	You should uncomment the below if you want to activate Gadu-Gadu
+	Transport. Also replace localhost with fully qualified domain name
+	of your server. Note that this must be 'gg.YOUR_FQDN', that means
+	there should be an alias gg.YOUR_FQDN configured to point to IP
+	address of the server.
+	-->
+
+	<!--
+	<item category="service" type="x-gadugadu" jid="gg.localhost" name="GaduGadu Transport">
+	  <ns>jabber:iq:gateway</ns>
+	  <ns>jabber:iq:register</ns>
+	  <ns>jabber:iq:search</ns>
+	  <ns>jabber:iq:agent</ns>
+	  <ns>jabber:iq:browse</ns>
+	</item>
+	-->
+
       </browse>
 
     </jsm>
@@@@ -264,26 +282,26 @@@@
     -->
 
     <load main="jsm">
-      <jsm>./jsm/jsm.so</jsm>
-      <mod_echo>./jsm/jsm.so</mod_echo>
-      <mod_roster>./jsm/jsm.so</mod_roster>
-      <mod_time>./jsm/jsm.so</mod_time>
-      <mod_vcard>./jsm/jsm.so</mod_vcard>
-      <mod_last>./jsm/jsm.so</mod_last>
-      <mod_version>./jsm/jsm.so</mod_version>
-      <mod_announce>./jsm/jsm.so</mod_announce>
-      <mod_agents>./jsm/jsm.so</mod_agents>
-      <mod_browse>./jsm/jsm.so</mod_browse>
-      <mod_admin>./jsm/jsm.so</mod_admin>
-      <mod_filter>./jsm/jsm.so</mod_filter>
-      <mod_offline>./jsm/jsm.so</mod_offline>
-      <mod_presence>./jsm/jsm.so</mod_presence>
-      <mod_auth_plain>./jsm/jsm.so</mod_auth_plain>
-      <mod_auth_digest>./jsm/jsm.so</mod_auth_digest>
-      <mod_auth_0k>./jsm/jsm.so</mod_auth_0k>
-      <mod_log>./jsm/jsm.so</mod_log>
-      <mod_register>./jsm/jsm.so</mod_register>
-      <mod_xml>./jsm/jsm.so</mod_xml>
+      <jsm>/usr/lib/jabber/jsm.so</jsm>
+      <mod_echo>/usr/lib/jabber/jsm.so</mod_echo>
+      <mod_roster>/usr/lib/jabber/jsm.so</mod_roster>
+      <mod_time>/usr/lib/jabber/jsm.so</mod_time>
+      <mod_vcard>/usr/lib/jabber/jsm.so</mod_vcard>
+      <mod_last>/usr/lib/jabber/jsm.so</mod_last>
+      <mod_version>/usr/lib/jabber/jsm.so</mod_version>
+      <mod_announce>/usr/lib/jabber/jsm.so</mod_announce>
+      <mod_agents>/usr/lib/jabber/jsm.so</mod_agents>
+      <mod_browse>/usr/lib/jabber/jsm.so</mod_browse>
+      <mod_admin>/usr/lib/jabber/jsm.so</mod_admin>
+      <mod_filter>/usr/lib/jabber/jsm.so</mod_filter>
+      <mod_offline>/usr/lib/jabber/jsm.so</mod_offline>
+      <mod_presence>/usr/lib/jabber/jsm.so</mod_presence>
+      <mod_auth_plain>/usr/lib/jabber/jsm.so</mod_auth_plain>
+      <mod_auth_digest>/usr/lib/jabber/jsm.so</mod_auth_digest>
+      <mod_auth_0k>/usr/lib/jabber/jsm.so</mod_auth_0k>
+      <mod_log>/usr/lib/jabber/jsm.so</mod_log>
+      <mod_register>/usr/lib/jabber/jsm.so</mod_register>
+      <mod_xml>/usr/lib/jabber/jsm.so</mod_xml>
     </load>
 
   </service>
@@@@ -295,10 +313,10 @@@@
   <xdb id="xdb">
     <host/>
     <load>
-      <xdb_file>./xdb_file/xdb_file.so</xdb_file>
+      <xdb_file>/usr/lib/jabber/xdb_file.so</xdb_file>
     </load>
     <xdb_file xmlns="jabber:config:xdb_file">
-      <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>
+      <spool><jabberd:cmdline flag='s'>/var/spool/jabber/jabberd</jabberd:cmdline></spool>
     </xdb_file>
   </xdb>
 
@@@@ -319,7 +337,7 @@@@
 
   <service id="c2s">
     <load>
-      <pthsock_client>./pthsock/pthsock_client.so</pthsock_client>
+      <pthsock_client>/usr/lib/jabber/pthsock_client.so</pthsock_client>
     </load>
     <pthcsock xmlns='jabber:config:pth-csock'>
       <authtime/>
@@@@ -343,8 +361,7 @@@@
       except it defines that SSL is to be used on the 
       ports and IP addresses specified. You must specify
       an IP address here, or the connections will fail.
-      <ssl port='5223'>127.0.0.1</ssl>
-      <ssl port='5224'>192.168.1.100</ssl>
+      <ssl port='5223'>your-ip-address</ssl>
       -->
 
     </pthcsock>
@@@@ -359,7 +376,7 @@@@
     <host/>
     <logtype/>
     <format>%d: [%t] (%h): %s</format>
-    <file>error.log</file>
+    <file>/var/log/jabber/jabberd-error</file>
     <stderr/>
   </log>
 
@@@@ -372,7 +389,7 @@@@
     <host/>
     <logtype>record</logtype>
     <format>%d %h %s</format>
-    <file>record.log</file>
+    <file>/var/log/jabber/jabberd-record</file>
   </log>
 
   <!-- The following two services are for handling server-to-server traffic. -->
@@@@ -382,7 +399,7 @@@@
   <service id="dnsrv">
     <host/>
     <load>
-      <dnsrv>./dnsrv/dnsrv.so</dnsrv>
+      <dnsrv>/usr/lib/jabber/dnsrv.so</dnsrv>
     </load>
     <dnsrv xmlns="jabber:config:dnsrv">
     	<resend service="_jabber._tcp">s2s</resend> <!-- for supporting SRV records -->
@@@@ -401,7 +418,7 @@@@
 
   <service id="s2s">
     <load>
-      <dialback>./dialback/dialback.so</dialback>
+      <dialback>/usr/lib/jabber/dialback.so</dialback>
     </load>
     <dialback xmlns='jabber:config:dialback'>
       <legacy/>
@@@@ -439,7 +456,7 @@@@
 
   <service id="conference">
     <load>
-      <groupchat>/path/to/groupchat.so</groupchat>
+      <groupchat>/usr/lib/jabber/groupchat.so</groupchat>
     </load>
     <host>conference.localhost</host>
   </service>
@@@@ -466,6 +483,22 @@@@
 
   end of <service/> examples -->
 
+    <!--
+    Replace localhost with fully qualified domain name (see a note above).
+    Replace your-ip-address with a IP address of the server.
+    -->
+
+    <!--
+    <service id="gglinker">
+	<host>gg.localhost</host>
+	<accept>
+	    <ip>your-ip-address</ip>
+	    <port>5353</port>
+	    <secret>secret</secret>
+	</accept>
+    </service>
+    -->
+
   <!--
   The following <io/> config initializes the top-level
   I/O, otherwise known as MIO (Managed Input/Output).
@@@@ -569,8 +602,7 @@@@
     -->
     <!--
     <ssl>
-      <key ip='192.168.1.1'>/path/to/cert_and_key.pem</key>
-      <key ip='192.168.1.100'>/path/to/other/cert_and_key.pem</key>
+      <key ip='your-ip-address'>/etc/jabber/key.pem</key>
     </ssl>
     -->
 
@@@@ -596,7 +628,7 @@@@
   <!--
   This specifies the file to store the pid of the process in.
   -->
-  <pidfile>./jabber.pid</pidfile>
+  <pidfile>/var/run/jabber/jabberd.pid</pidfile>
 
 
 </jabber>
@


1.11
log
@- In rc.jabberd, wait 5 seconds before running jggtrans.
- Kill jabberd by pid from pidfile.
@
text
@d16 1
a16 1
+	<service type="x-gadugadu" jid="gg.localhost" name="GaduGadu Transport">
d22 1
a22 1
+	</service>
@


1.10
log
@- Added support for jggtrans to rc.jabberd.
- Cosmetics in rc.jabberd.
@
text
@@


1.9
log
@- Added example sections to jabber.xml to run GG transport.
@
text
@@


1.8
log
@- Updated everything to work with /var/spool/jabber/jabberd as spool
  directory.
@
text
@d2 27
a28 2
+++ jabber.xml	2003-01-19 15:53:21.000000000 +0100
@@@@ -264,26 +264,26 @@@@
d75 1
a75 1
@@@@ -295,10 +295,10 @@@@
d88 1
a88 1
@@@@ -319,7 +319,7 @@@@
d97 1
a97 1
@@@@ -343,8 +343,7 @@@@
d107 1
a107 1
@@@@ -359,7 +358,7 @@@@
d116 1
a116 1
@@@@ -372,7 +371,7 @@@@
d125 1
a125 1
@@@@ -382,7 +381,7 @@@@
d134 1
a134 1
@@@@ -401,7 +400,7 @@@@
d143 1
a143 1
@@@@ -439,7 +438,7 @@@@
d152 24
a175 1
@@@@ -569,8 +568,7 @@@@
d185 1
a185 1
@@@@ -596,7 +594,7 @@@@
@


1.7
log
@- Moved pidfile to /var/run/jabber.
- Create var/run/jabber and chmod 700, chown jabber.root.
- Chmod 700 var/log/jabber.
- Extended ending message in jabberd-keygen.
@
text
@d59 1
a59 1
+      <spool><jabberd:cmdline flag='s'>/var/spool/jabberd</jabberd:cmdline></spool>
@


1.6
log
@- Updated the dirs patch to change pidfile location to
  /etc/jabber/jabberd.pid.
- Improved rc.jabberd to detect whether jabberd is or isn't running.
- Don't include var/run in the package.
- Cosmetics in jabberd-keygen output.
@
text
@d142 1
a142 1
+  <pidfile>/etc/jabber/jabberd.pid</pidfile>
@


1.5
log
@- Fixed a path to key.pem in the dirs patch.
- Improved rc.jabberd (start/stop/restart).
- Cosmetics in script.postinst output.
@
text
@d142 1
a142 1
+  <pidfile>/var/run/jabber.pid</pidfile>
@


1.4
log
@- Added jabberd-keygen to help to generate SSL keys.
- Updated the dirs patch to preconfigure SSL.
- Changed everywhere usr/lib/jabberd to usr/lib/jabber.
- Chmod 700 etc/jabber.
- Updated rc.jabberd to set everywhere ownership to jabber.root.
- Updated rc.jabberd to redirect jabberd output to /dev/null.
@
text
@d133 1
a133 1
+      <key ip='your-ip-address'>/etc/jabber</key>
@


1.3
log
@- In rc.jabberd, chown -R jabber.users /var/log/jabber.
@
text
@d2 1
a2 1
+++ jabber.xml	2003-01-19 14:39:30.000000000 +0100
d27 20
a46 20
+      <jsm>/usr/lib/jabberd/jsm.so</jsm>
+      <mod_echo>/usr/lib/jabberd/jsm.so</mod_echo>
+      <mod_roster>/usr/lib/jabberd/jsm.so</mod_roster>
+      <mod_time>/usr/lib/jabberd/jsm.so</mod_time>
+      <mod_vcard>/usr/lib/jabberd/jsm.so</mod_vcard>
+      <mod_last>/usr/lib/jabberd/jsm.so</mod_last>
+      <mod_version>/usr/lib/jabberd/jsm.so</mod_version>
+      <mod_announce>/usr/lib/jabberd/jsm.so</mod_announce>
+      <mod_agents>/usr/lib/jabberd/jsm.so</mod_agents>
+      <mod_browse>/usr/lib/jabberd/jsm.so</mod_browse>
+      <mod_admin>/usr/lib/jabberd/jsm.so</mod_admin>
+      <mod_filter>/usr/lib/jabberd/jsm.so</mod_filter>
+      <mod_offline>/usr/lib/jabberd/jsm.so</mod_offline>
+      <mod_presence>/usr/lib/jabberd/jsm.so</mod_presence>
+      <mod_auth_plain>/usr/lib/jabberd/jsm.so</mod_auth_plain>
+      <mod_auth_digest>/usr/lib/jabberd/jsm.so</mod_auth_digest>
+      <mod_auth_0k>/usr/lib/jabberd/jsm.so</mod_auth_0k>
+      <mod_log>/usr/lib/jabberd/jsm.so</mod_log>
+      <mod_register>/usr/lib/jabberd/jsm.so</mod_register>
+      <mod_xml>/usr/lib/jabberd/jsm.so</mod_xml>
d55 1
a55 1
+      <xdb_file>/usr/lib/jabberd/xdb_file.so</xdb_file>
d68 1
a68 1
+      <pthsock_client>/usr/lib/jabberd/pthsock_client.so</pthsock_client>
d72 11
a82 1
@@@@ -359,7 +359,7 @@@@
d91 1
a91 1
@@@@ -372,7 +372,7 @@@@
d100 1
a100 1
@@@@ -382,7 +382,7 @@@@
d105 1
a105 1
+      <dnsrv>/usr/lib/jabberd/dnsrv.so</dnsrv>
d109 1
a109 1
@@@@ -401,7 +401,7 @@@@
d114 1
a114 1
+      <dialback>/usr/lib/jabberd/dialback.so</dialback>
d118 20
a137 1
@@@@ -596,7 +596,7 @@@@
@


1.2
log
@- Updated the dirs patch to set logfiles location.
- Make var/log/jabber.
- Added a postinst script to handle configuration file.
- Added msg_installing.
@
text
@@


1.1
log
@- Removed the spooldir patch.
- Added a dirs patch that covers all directories (/usr/lib/jabberd for
  modules, /var/spool/jabberd for spool directory, /var/run for pid file).
- Copy dnsrv/dnsrv.so, jsm/jsm.so, pthsock/pthsock_client.so,
  xdb_file/xdb_file.so and dialback/dialback.so into usr/lib/jabberd.
- Create var/run.
@
text
@d2 1
a2 1
+++ jabber.xml	2003-01-19 00:26:53.000000000 +0100
d72 18
@


.