packages: tigase-server/tigase-server.init, tigase-server/tigase-server.spe...
jajcus
jajcus at pld-linux.org
Fri May 6 10:42:53 CEST 2011
Author: jajcus Date: Fri May 6 08:42:53 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- patch provided startup script instead of providing our own
- Release: 0.2
---- Files affected:
packages/tigase-server:
tigase-server.init (1.1 -> 1.2) , tigase-server.spec (1.1 -> 1.2) , tigase-server.upstart (1.1 -> 1.2) , tigase-server-start_script.patch (NONE -> 1.1) (NEW), tigase-server.sh (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/tigase-server/tigase-server.init
diff -u packages/tigase-server/tigase-server.init:1.1 packages/tigase-server/tigase-server.init:1.2
--- packages/tigase-server/tigase-server.init:1.1 Thu May 5 16:08:37 2011
+++ packages/tigase-server/tigase-server.init Fri May 6 10:42:48 2011
@@ -38,11 +38,7 @@
fi
msg_starting "tigase-server"
emit starting JOB=tigase-server
- if [ -z "$TIGASE_CONSOLE_LOG" ] ; then
- TIGASE_CONSOLE_LOG=/var/log/tigase-server/tigase-console.log
- fi
- export TIGASE_CONSOLE_LOG
- daemon --fork /usr/bin/tigase-server
+ daemon tigase-server start
if [ "$RETVAL" = 0 ] ; then
touch /var/lock/subsys/tigase-server
emit --no-wait started JOB=tigase-server
@@ -58,7 +54,7 @@
emit stopping JOB=tigase-server
killproc tigase-server
emit --no-wait stopped JOB=tigase-server
- rm -f /var/lock/subsys/tigase-server >/dev/null 2>&1
+ rm -f /var/lock/subsys/tigase-server
}
upstart_controlled
================================================================
Index: packages/tigase-server/tigase-server.spec
diff -u packages/tigase-server/tigase-server.spec:1.1 packages/tigase-server/tigase-server.spec:1.2
--- packages/tigase-server/tigase-server.spec:1.1 Thu May 5 16:08:37 2011
+++ packages/tigase-server/tigase-server.spec Fri May 6 10:42:48 2011
@@ -7,7 +7,7 @@
Name: tigase-server
Version: 5.0.0
%define build_id 2135
-Release: 0.1
+Release: 0.2
License: GPL v3
Group: Applications/Communications
# http://www.tigase.org/content/tigase-downloads?fid=2199
@@ -16,9 +16,9 @@
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.upstart
-Source4: %{name}.sh
-Source5: derby-db-create.sh
+Source4: derby-db-create.sh
Patch0: %{name}-paths.patch
+Patch1: %{name}-start_script.patch
URL: http://www.tigase.org/
BuildRequires: rpmbuild(macros) >= 1.228
Requires(postun): /usr/sbin/groupdel
@@ -78,6 +78,7 @@
%prep
%setup -q -n %{name}-%{version}-b%{build_id}
%patch0 -p1
+%patch1 -p1
%build
@@ -93,14 +94,15 @@
cp -R database jars libs $RPM_BUILD_ROOT%{_datadir}/%{name}
+install scripts/tigase.sh $RPM_BUILD_ROOT%{_bindir}/tigase-server
+
ln -s /var/log/tigase $RPM_BUILD_ROOT%{_datadir}/%{name}/logs
ln -s logs/derby.log $RPM_BUILD_ROOT%{_datadir}/%{name}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/derby-db-create.sh
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/derby-db-create.sh
touch $RPM_BUILD_ROOT/var/log/%{name}/derby.log
@@ -168,6 +170,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2011/05/06 08:42:48 jajcus
+- patch provided startup script instead of providing our own
+- Release: 0.2
+
Revision 1.1 2011/05/05 14:08:37 jajcus
- new package
================================================================
Index: packages/tigase-server/tigase-server.upstart
diff -u packages/tigase-server/tigase-server.upstart:1.1 packages/tigase-server/tigase-server.upstart:1.2
--- packages/tigase-server/tigase-server.upstart:1.1 Thu May 5 16:08:37 2011
+++ packages/tigase-server/tigase-server.upstart Fri May 6 10:42:48 2011
@@ -10,7 +10,7 @@
script
export TIGASE_CONSOLE_LOG=/var/log/tigase-server/tigase-console.log
- exec /usr/bin/tigase-server
+ exec /usr/bin/tigase-server run
end script
# vi: ft=upstart
================================================================
Index: packages/tigase-server/tigase-server-start_script.patch
diff -u /dev/null packages/tigase-server/tigase-server-start_script.patch:1.1
--- /dev/null Fri May 6 10:42:53 2011
+++ packages/tigase-server/tigase-server-start_script.patch Fri May 6 10:42:48 2011
@@ -0,0 +1,147 @@
+diff -dur tigase-server-5.0.0-b2135.orig/scripts/tigase.sh tigase-server-5.0.0-b2135/scripts/tigase.sh
+--- tigase-server-5.0.0-b2135.orig/scripts/tigase.sh 2010-03-20 22:06:06.000000000 +0100
++++ tigase-server-5.0.0-b2135/scripts/tigase.sh 2011-05-06 09:47:17.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##
+ ## Tigase Jabber/XMPP Server
+ ## Copyright (C) 2004-2007 "Artur Hefczyc" <artur.hefczyc at tigase.org>
+@@ -37,16 +37,24 @@
+ # If not given the script will try to search for the file and if
+ # not found default parameters will be used.
+
+-function usage()
++usage()
+ {
+ echo "Usage: $0 {start|stop|run|restart|check} [params-file.conf]"
+ exit 1
+ }
+
++. /usr/share/java-utils/java-functions
++set_jvm
++TIGASE_HOME=/usr/share/tigase-server
++TIGASE_CONFIG=/etc/tigase-server/tigase.xml
++TIGASE_PID=/var/run/tigase-server.pid
++
+ if [ -z "${2}" ] ; then
+ DEF_PARAMS="tigase.conf"
++ if [ -f "/etc/tigase-server/${DEF_PARAMS}" ] ; then
++ TIGASE_PARAMS="/etc/tigase-server/${DEF_PARAMS}"
++ elif [ -f "/etc/conf.d/${DEF_PARAMS}" ] ; then
+ # Gentoo style config location
+- if [ -f "/etc/conf.d/${DEF_PARAMS}" ] ; then
+ TIGASE_PARAMS="/etc/conf.d/${DEF_PARAMS}"
+ elif [ -f "/etc/${DEF_PARAMS}" ] ; then
+ TIGASE_PARAMS="/etc/${DEF_PARAMS}"
+@@ -97,12 +105,12 @@
+ fi
+ if [ -z "${TIGASE_PID}" ] ; then
+ if [ -w "${TIGASE_HOME}/logs/" ] ; then
+- TIGASE_PID="${TIGASE_HOME}/logs/tigase.pid"
++ TIGASE_PID="${TIGASE_HOME}/logs/tigase-server.pid"
+ else
+ if [ -w "/var/run/" ] ; then
+- TIGASE_PID="/var/run/tigase.pid"
++ TIGASE_PID="/var/run/tigase-server.pid"
+ else
+- TIGASE_PID="/var/tmp/tigase.pid"
++ TIGASE_PID="/var/tmp/tigase-server.pid"
+ fi
+ fi
+ fi
+@@ -137,50 +145,30 @@
+
+ CLASSPATH="`ls -d ${TIGASE_HOME}/libs/*.jar 2>/dev/null | grep -v wrapper | tr '\n' :`${CLASSPATH}"
+
+-TIGASE_CMD="${JAVA} ${JAVA_OPTIONS} -cp ${CLASSPATH} ${TIGASE_RUN}"
++TIGASE_CMD="${JAVA}"
++TIGASE_ARGS="${JAVA_OPTIONS} -cp ${CLASSPATH} ${TIGASE_RUN}"
+
+ cd "${TIGASE_HOME}"
+
+ case "${1}" in
+ start)
+- echo "Starting Tigase: "
+-
+- if [ -f ${TIGASE_PID} ] && kill -0 $(<${TIGASE_PID}) 2>/dev/null
+- then
+- echo "Already Running!!"
+- exit 1
+- fi
+-
+- echo "STARTED Tigase `date`" >> ${TIGASE_CONSOLE_LOG}
+-
+- nohup sh -c "exec $TIGASE_CMD >>${TIGASE_CONSOLE_LOG} 2>&1" >/dev/null &
+- echo $! > $TIGASE_PID
+- echo "Tigase running pid="`cat $TIGASE_PID`
++ start-stop-daemon --start \
++ --exec "$TIGASE_CMD" \
++ --pidfile=${TIGASE_PID} \
++ --make-pidfile \
++ --chuid jabber \
++ --user jabber \
++ --group jabber \
++ --background \
++ -- $TIGASE_ARGS
+ ;;
+
+ stop)
+- PID=`cat $TIGASE_PID 2>/dev/null`
+- if [ -z "$PID" ] ; then
+- echo "Tigase is not running."
+- exit 0
+- fi
+- echo "Shutting down Tigase: $PID"
+- kill $PID 2>/dev/null
+- for ((i=1; i <= 30; i++)) ; do
+- if ps -p $PID > /dev/null ; then
+- echo "$i. Waiting for the server to terminate..."
+- sleep 1
+- else
+- echo "$i. Tigase terminated."
+- break
+- fi
+- done
+- if ps -p $PID > /dev/null ; then
+- echo "Forcing the server to terminate."
+- kill -9 $PID 2>/dev/null
+- fi
+- rm -f $TIGASE_PID
+- echo "STOPPED `date`" >>${TIGASE_CONSOLE_LOG}
++ start-stop-daemon --stop \
++ --user jabber \
++ --exec "$TIGASE_CMD" \
++ --retry 15 \
++ --pidfile=$TIGASE_PID && rm -f $TIGASE_PID
+ ;;
+
+ restart)
+@@ -192,13 +180,17 @@
+ run)
+ echo "Running Tigase: "
+
+- if [ -f $TIGASE_PID ]
++ if [ -f $TIGASE_PID ] && kill -0 "$(cat $TIGASE_PID)" 2>/dev/null
+ then
+ echo "Already Running!!"
+ exit 1
+ fi
+
+- sh -c "exec $TIGASE_CMD"
++ if [ `id -u` = 0 ] ; then
++ TIGASE_ARGS="-s jabber $TIGASE_CMD $TIGASE_ARGS"
++ TIGASE_CMD=/sbin/setuidgid
++ fi
++ exec "$TIGASE_CMD" $TIGASE_ARGS
+ ;;
+
+ check)
+@@ -215,7 +207,6 @@
+ echo "JAVA_CMD = $JAVA_CMD"
+ echo "CLASSPATH = $CLASSPATH"
+ echo "TIGASE_CMD = $TIGASE_CMD"
+- echo "TIGASE_CONSOLE_LOG = $TIGASE_CONSOLE_LOG"
+ echo
+
+ if [ -f ${TIGASE_PID} ]
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server.init?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigase-server/tigase-server.upstart?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list