rpms/ejabberd/devel ejabberd.sysconfig, NONE, 1.1 .cvsignore, 1.11, 1.12 ejabberd.init, 1.6, 1.7 ejabberd.spec, 1.32, 1.33 import.log, 1.6, 1.7 sources, 1.13, 1.14

Peter Lemenkov peter at fedoraproject.org
Mon Jan 26 16:43:28 UTC 2009


Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31342/devel

Modified Files:
	.cvsignore ejabberd.init ejabberd.spec import.log sources 
Added Files:
	ejabberd.sysconfig 
Log Message:
Ver. 2.0.3


--- NEW FILE ejabberd.sysconfig ---
## Settings for ejabberd

## Where should ejabberd find its configuration file?
#
#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg

## ULIMIT_MAX_FILES alters the number of files that ejabberd is
## allowed to have open at once.  If it is unset the system default
## (usually 1024) will be used.  ejabberd will want over twice as many
## open files as it has active connections, so if you have a few
## hundred or more users you will want to set this.
#
#ULIMIT_MAX_FILES=1024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2008 20:16:17 -0000	1.11
+++ .cvsignore	26 Jan 2009 16:42:58 -0000	1.12
@@ -1 +1 @@
-ejabberd-2.0.2.tar.gz
+ejabberd-2.0.3.tar.gz


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ejabberd.init	22 Jun 2008 18:56:07 -0000	1.6
+++ ejabberd.init	26 Jan 2009 16:42:58 -0000	1.7
@@ -17,15 +17,26 @@
 
 . /etc/rc.d/init.d/functions
 
+if [ -r /etc/sysconfig/ejabberd ]; then
+	. /etc/sysconfig/ejabberd
+fi
+
+if [ ! "$CONFIG_FILE" ]; then
+	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+fi
+
 node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
+	if [ "$ULIMIT_MAX_FILES" ]; then
+		ulimit -n $ULIMIT_MAX_FILES
+	fi
         daemon --user=ejabberd --check=ejabberd \
 	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
-                   -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
+                   -ejabberd config \\\"$CONFIG_FILE\\\" \
                              log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
                    -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
                    -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ejabberd.spec	16 Jan 2009 08:58:57 -0000	1.32
+++ ejabberd.spec	26 Jan 2009 16:42:58 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        2.0.2
-Release:        4%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
+Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
 # svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -151,12 +152,14 @@
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
-mkdir -p %{buildroot}%{_initrddir}
-install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
-chmod a+x %{buildroot}%{_initrddir}/ejabberd
+# install init-script
+install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+# install config for logrotate
+install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+
+# install sysconfig file
+install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
@@ -178,7 +181,7 @@
 
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-
+%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
@@ -211,6 +214,10 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
 - rebuild with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Oct 2008 05:28:56 -0000	1.6
+++ import.log	26 Jan 2009 16:42:58 -0000	1.7
@@ -4,3 +4,4 @@
 ejabberd-2_0_2-0_3_beta1_fc9:HEAD:ejabberd-2.0.2-0.3.beta1.fc9.src.rpm:1218350775
 ejabberd-2_0_2-1_fc9:HEAD:ejabberd-2.0.2-1.fc9.src.rpm:1220040866
 ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272
+ejabberd-2_0_3-1_fc10:HEAD:ejabberd-2.0.3-1.fc10.src.rpm:1232988133


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Aug 2008 20:16:17 -0000	1.13
+++ sources	26 Jan 2009 16:42:58 -0000	1.14
@@ -1 +1 @@
-eef7ab12fc1e3ed34669bb2d5e1d0448  ejabberd-2.0.2.tar.gz
+b647e74b0f94f030bd8747c8a8a4d0f9  ejabberd-2.0.3.tar.gz




More information about the fedora-extras-commits mailing list