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: 26-Nov-2003 12:43:28
Branch: HEAD Handle: 2003112611432602
Modified files:
openpkg-src/tomcat rc.tomcat tomcat.spec
openpkg-web news.txt
Log:
Implement PR #202
Summary:
Revision Changes Path
1.15 +89 -0 openpkg-src/tomcat/rc.tomcat
1.34 +12 -2 openpkg-src/tomcat/tomcat.spec
1.7546 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/rc.tomcat
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.tomcat
--- openpkg-src/tomcat/rc.tomcat 22 Jul 2003 08:11:15 -0000 1.14
+++ openpkg-src/tomcat/rc.tomcat 26 Nov 2003 11:43:28 -0000 1.15
@@ -6,25 +6,114 @@
%config
tomcat_enable="$openpkg_rc_def"
tomcat_home="@l_prefix@/libexec/tomcat"
+ tomcat_examples_file="@l_prefix@/var/tomcat/log/examples.log"
+ tomcat_examples_prolog="true"
+ tomcat_examples_epilog="true"
+ tomcat_examples_numfiles="10"
+ tomcat_examples_minsize="1M"
+ tomcat_examples_complevel="9"
+ tomcat_jasper_file="@l_prefix@/var/tomcat/log/jasper.log"
+ tomcat_jasper_prolog="true"
+ tomcat_jasper_epilog="true"
+ tomcat_jasper_numfiles="10"
+ tomcat_jasper_minsize="1M"
+ tomcat_jasper_complevel="9"
+ tomcat_servlet_file="@l_prefix@/var/tomcat/log/servlet.log"
+ tomcat_servlet_prolog="true"
+ tomcat_servlet_epilog="true"
+ tomcat_servlet_numfiles="10"
+ tomcat_servlet_minsize="1M"
+ tomcat_servlet_complevel="9"
+ tomcat_servexample_file="@l_prefix@/var/tomcat/log/servlet_examples.log"
+ tomcat_servexample_prolog="true"
+ tomcat_servexample_epilog="true"
+ tomcat_servexample_numfiles="10"
+ tomcat_servexample_minsize="1M"
+ tomcat_servexample_complevel="9"
+ tomcat_tomcat_file="@l_prefix@/var/tomcat/log/tomcat.log"
+ tomcat_tomcat_prolog="true"
+ tomcat_tomcat_epilog="true"
+ tomcat_tomcat_numfiles="10"
+ tomcat_tomcat_minsize="1M"
+ tomcat_tomcat_complevel="9"
+
+%common
+ tomcat_pidfile="@l_prefix@/var/tomcat/log/tomcat.pid"
+ tomcat_signal () {
+ [ -f $tomcat_pidfile ] && kill -$1 `cat $tomcat_pidfile`
+ }
+
+%status -u @l_rusr@ -o
+ tomcat_usable="unknown"
+ tomcat_active="no"
+ rcService tomcat enable yes && \
+ tomcat_signal 0 && tomcat_active="yes"
+ echo "tomcat_enable=\"$tomcat_enable\""
+ echo "tomcat_usable=\"$tomcat_usable\""
+ echo "tomcat_active=\"$tomcat_active\""
%start -u @l_rusr@
rcService tomcat enable yes || exit 0
+ rcService tomcat active yes && exit 0
JAVA_HOME="$JDK_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh start
%stop -u @l_rusr@
rcService tomcat enable yes || exit 0
+ rcService tomcat active no && exit 0
JAVA_HOME="$JDK_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh stop
%restart -u @l_rusr@
rcService tomcat enable yes || exit 0
+ rcService tomcat active no && exit 0
JAVA_HOME="$JDK_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh stop
$TOMCAT_HOME/bin/tomcat.sh start
+
+%daily -u @l_susr@
+ rcService tomcat enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${tomcat_examples_numfiles} -s ${tomcat_examples_minsize} -d \
+ -z ${tomcat_examples_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${tomcat_examples_prolog}" \
+ -E "${tomcat_examples_epilog} && echo 1 >$hintfile" \
+ ${tomcat_examples_file}
+ shtool rotate -f \
+ -n ${tomcat_jasper_numfiles} -s ${tomcat_jasper_minsize} -d \
+ -z ${tomcat_jasper_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${tomcat_jasper_prolog}" \
+ -E "${tomcat_jasper_epilog} && echo 1 >$hintfile" \
+ ${tomcat_jasper_file}
+ shtool rotate -f \
+ -n ${tomcat_servlet_numfiles} -s ${tomcat_servlet_minsize} -d \
+ -z ${tomcat_servlet_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${tomcat_servlet_prolog}" \
+ -E "${tomcat_servlet_epilog} && echo 1 >$hintfile" \
+ ${tomcat_servlet_file}
+ shtool rotate -f \
+ -n ${tomcat_servexample_numfiles} -s ${tomcat_servexample_minsize} -d \
+ -z ${tomcat_servexample_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${tomcat_servexample_prolog}" \
+ -E "${tomcat_servexample_epilog} && echo 1 >$hintfile" \
+ ${tomcat_servexample_file}
+ shtool rotate -f \
+ -n ${tomcat_tomcat_numfiles} -s ${tomcat_tomcat_minsize} -d \
+ -z ${tomcat_tomcat_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${tomcat_tomcat_prolog}" \
+ -E "${tomcat_tomcat_epilog} && echo 1 >$hintfile" \
+ ${tomcat_tomcat_file}
+ if [ -s $hintfile ]; then
+ rc imapd restart
+ fi
+ rcTmp -k
%env
rcService tomcat enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec 8 Sep 2003 12:12:07 -0000 1.33
+++ openpkg-src/tomcat/tomcat.spec 26 Nov 2003 11:43:28 -0000 1.34
@@ -33,7 +33,7 @@
Group: Web
License: Apache Software License 1.1
Version: 3.3.1a
-Release: 20030908
+Release: 20031126
# list of sources
Source0:
http://www.apache.org/dist/jakarta/tomcat-3/src/jakarta-tomcat-%{version}.tar.gz
@@ -131,9 +131,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+ # after upgrade, restart service
+ if [ $1 -eq 2 ]; then
+ eval `%{l_rc} tomcat status 2>/dev/null`
+ [ ".$tomcat_active" = .yes ] && %{l_rc} tomcat restart
+ fi
+ exit 0
+
%preun
if [ $1 -eq 0 ]; then
- # remove log files
+ # before erase, stop service and remove log files
+ %{l_rc} tomcat stop 2>/dev/null
rm -f $RPM_INSTALL_PREFIX/var/tomcat/log/*
rm -rf $RPM_INSTALL_PREFIX/var/tomcat/work/*
rm -rf $RPM_INSTALL_PREFIX/var/tomcat/conf/*.id
@@ -144,4 +153,5 @@
fi
done
fi
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7545 -r1.7546 news.txt
--- openpkg-web/news.txt 26 Nov 2003 10:47:08 -0000 1.7545
+++ openpkg-web/news.txt 26 Nov 2003 11:43:26 -0000 1.7546
@@ -1,3 +1,4 @@
+26-Nov-2003: Upgraded package: P<tomcat-3.3.1a-20031126>
26-Nov-2003: Upgraded package: P<libnet-1.1.1-20031126>
26-Nov-2003: Upgraded package: P<powerdns-2.9.12-20031126>
26-Nov-2003: Upgraded package: P<tla-1.1pre9-20031126>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
