OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   26-Nov-2003 15:07:00
  Branch: HEAD                             Handle: 2003112614070000

  Modified files:
    openpkg-src/tomcat      rc.tomcat

  Log:
    fix PR #202 typo and all of PR #291 as well, unfortunately by
    increasing the running daemon's privileges

  Summary:
    Revision    Changes     Path
    1.16        +10 -10     openpkg-src/tomcat/rc.tomcat
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/tomcat/rc.tomcat
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 rc.tomcat
  --- openpkg-src/tomcat/rc.tomcat      26 Nov 2003 11:43:28 -0000      1.15
  +++ openpkg-src/tomcat/rc.tomcat      26 Nov 2003 14:07:00 -0000      1.16
  @@ -43,7 +43,7 @@
           [ -f $tomcat_pidfile ] && kill -$1 `cat $tomcat_pidfile`
       }
   
  -%status -u @l_rusr@ -o
  +%status -u @l_susr@ -o
       tomcat_usable="unknown"
       tomcat_active="no"
       rcService tomcat enable yes && \
  @@ -52,21 +52,21 @@
       echo "tomcat_usable=\"$tomcat_usable\""
       echo "tomcat_active=\"$tomcat_active\""
   
  -%start -u @l_rusr@
  +%start -u @l_susr@
       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@
  +%stop -u @l_susr@
       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@
  +%restart -u @l_susr@
       rcService tomcat enable yes || exit 0
       rcService tomcat active no && exit 0
       JAVA_HOME="$JDK_home"; export JAVA_HOME
  @@ -82,36 +82,36 @@
       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 \
  +        -z ${tomcat_examples_complevel} -o @l_susr@ -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 \
  +        -z ${tomcat_jasper_complevel} -o @l_susr@ -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 \
  +        -z ${tomcat_servlet_complevel} -o @l_susr@ -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 \
  +        -z ${tomcat_servexample_complevel} -o @l_susr@ -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 \
  +        -z ${tomcat_tomcat_complevel} -o @l_susr@ -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
  +        rc tomcat restart
       fi
       rcTmp -k
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to