OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Oct-2003 17:32:06
Branch: HEAD Handle: 2003100716320402
Modified files:
openpkg-src/jabberd jabberd.spec rc.jabberd
openpkg-web news.txt
Log:
Modernize rc file, and add features from ticket #202
Summary:
Revision Changes Path
1.13 +16 -2 openpkg-src/jabberd/jabberd.spec
1.8 +65 -5 openpkg-src/jabberd/rc.jabberd
1.6902 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 27 Aug 2003 13:53:26 -0000 1.12
+++ openpkg-src/jabberd/jabberd.spec 7 Oct 2003 15:32:06 -0000 1.13
@@ -33,7 +33,7 @@
Group: Network
License: JOSL/GPL
Version: 1.4.2
-Release: 20030827
+Release: 20031007
# list of sources
Source0: http://jabberd.jabberstudio.org/downloads/jabber-%{version}.tar.gz
@@ -109,10 +109,24 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/jabberd/*' \
- '%dir %attr(700,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd'
+ '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd'
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} jabberd status 2>/dev/null`
+ [ ".$jabberd_active" = .yes ] && %{l_rc} jabberd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} jabberd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/jabberd/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/rc.jabberd
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.jabberd
--- openpkg-src/jabberd/rc.jabberd 22 Jul 2003 08:10:50 -0000 1.7
+++ openpkg-src/jabberd/rc.jabberd 7 Oct 2003 15:32:06 -0000 1.8
@@ -5,16 +5,76 @@
%config
jabberd_enable="$openpkg_rc_def"
+ jabberd_hostname=`hostname`
+ jabberd_error_prolog="true"
+ jabberd_error_epilog="true"
+ jabberd_error_numfiles="10"
+ jabberd_error_minsize="1M"
+ jabberd_error_complevel="9"
+ jabberd_error_file="@l_prefix@/var/jabberd/error.log"
+ jabberd_record_prolog="true"
+ jabberd_record_epilog="true"
+ jabberd_record_numfiles="10"
+ jabberd_record_minsize="1M"
+ jabberd_record_complevel="9"
+ jabberd_record_file="@l_prefix@/var/jabberd/record.log"
+
+%common
+ jabberd_pidfile="@l_prefix@/var/jabberd/jabberd.pid"
+ jabberd_cfgfile="@l_prefix@/etc/jabberd/jabber.xml"
+ jabberd_signal () {
+ [ -f $jabberd_pidfile ] && kill -$1 `cat $jabberd_pidfile`
+ }
+
+%status -u @l_nusr@ -o
+ jabberd_usable="no"
+ jabberd_active="no"
+ rcService jabberd enable yes && \
+ jabberd_chroot && jabberd_usable="yes"
+ rcService jabberd enable yes && \
+ jabberd_signal 0 && jabberd_active="yes"
+ echo "jabberd_enable=\"$jabberd_enable\""
+ echo "jabberd_usable=\"$jabberd_usable\""
+ echo "jabberd_active=\"$jabberd_active\""
%start -u @l_nusr@
rcService jabberd enable yes || exit 0
- umask 077
- @l_prefix@/sbin/jabberd -B -h `hostname` -c @l_prefix@/etc/jabberd/jabber.xml
+ rcService jabberd active yes && exit 0
+ @l_prefix@/sbin/jabberd -B -h $jabberd_hostname -c $jabberd_cfgfile
%stop -u @l_nusr@
rcService jabberd enable yes || exit 0
- if [ -f @l_prefix@/var/jabberd/jabberd.pid ]; then
- kill `cat @l_prefix@/var/jabberd/jabberd.pid`
- rm -f @l_prefix@/var/jabberd/jabberd.pid
+ rcService jabberd active no && exit 0
+ jabberd_signal TERM
+ rm -f $jabberd_pidfile
+
+%restart -u @l_nusr@
+ rcService jabberd enable yes || exit 0
+ rcService jabberd active no && exit 0
+ rc jabberd stop
+ sleep 2
+ rc jabberd start
+
+%daily -u @l_susr@
+ rcService jabberd enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${jabberd_error_numfiles} -s ${jabberd_error_minsize} -d \
+ -z ${jabberd_error_complevel} -o @l_nusr@ -g @l_ngrp@ -m 644 \
+ -P "${jabberd_error_prolog}" \
+ -E "${jabberd_error_epilog} && echo 1 >$hintfile" \
+ ${jabberd_error_file}
+ shtool rotate -f \
+ -n ${jabberd_record_numfiles} -s ${jabberd_record_minsize} -d \
+ -z ${jabberd_record_complevel} -o @l_nusr@ -g @l_ngrp@ -m 644 \
+ -P "${jabberd_record_prolog}" \
+ -E "${jabberd_record_epilog} && echo 1 >$hintfile" \
+ ${jabberd_record_file}
+ if [ -s $hintfile ]; then
+ rc jabberd restart
fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6901 -r1.6902 news.txt
--- openpkg-web/news.txt 7 Oct 2003 14:25:16 -0000 1.6901
+++ openpkg-web/news.txt 7 Oct 2003 15:32:04 -0000 1.6902
@@ -1,3 +1,4 @@
+07-Oct-2003: Upgraded package: P<jabberd-1.4.2-20031007>
07-Oct-2003: Upgraded package: P<arpd-0.2-20031007>
07-Oct-2003: Upgraded package: P<honeyd-0.6a-20031007>
07-Oct-2003: Upgraded package: P<mico-2.3.10-20031007>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
