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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   18-Jul-2003 17:56:20
  Branch: HEAD                             Handle: 2003071816561900

  Modified files:
    openpkg-src/imapd       rc.imapd

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.15        +23 -13     openpkg-src/imapd/rc.imapd
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/imapd/rc.imapd
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 rc.imapd
  --- openpkg-src/imapd/rc.imapd        17 Jul 2003 21:34:43 -0000      1.14
  +++ openpkg-src/imapd/rc.imapd        18 Jul 2003 15:56:19 -0000      1.15
  @@ -13,32 +13,42 @@
       POP_type="cyrus"
       POP_logfile="@l_prefix@/var/imapd/log/pop3d.log"
   
  +%common
  +    imapd_pidfile="@l_prefix@/var/imapd/imapd.pid"
  +    imapd_signal () {
  +        [ -f $imapd_pidfile ] && kill -$1 `cat $imapd_pidfile`
  +    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    imapd_usable="unknown"
  +    imapd_active="no"
  +    opService imapd enable yes && \
  +        imapd_signal 0 && imapd_active="yes"
  +    echo "imapd_enable=\"$imapd_enable\""
  +    echo "imapd_usable=\"$imapd_usable\""
  +    echo "imapd_active=\"$imapd_active\""
  +
   %start -p 200 -u @l_susr@
       opService imapd enable yes || exit 0
       @l_prefix@/bin/cyrmaster &
  -    echo $! >@l_prefix@/var/imapd/imapd.pid
  +    echo $! >$imapd_pidfile
   
   %stop -p 200 -u @l_susr@
       opService imapd enable yes || exit 0
  -    if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
  -        rm @l_prefix@/var/imapd/imapd.pid
  -    fi
  +    imapd_signal TERM
  +    rm $imapd_pidfile
   
   %restart -u @l_susr@
       opService imapd enable yes || exit 0
  -    if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/imapd/imapd.pid`
  -        sleep 2
  -    fi
  +    imapd_signal TERM
  +    rm $imapd_pidfile
  +    sleep 2
       @l_prefix@/bin/cyrmaster &
  -    echo $! >@l_prefix@/var/imapd/imapd.pid
  +    echo $! >$imapd_pidfile
   
   %reload -u @l_susr@
       opService imapd enable yes || exit 0
  -    if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
  -        kill -HUP `cat @l_prefix@/var/imapd/imapd.pid`
  -    fi
  +    imapd_signal HUP
   
   %daily -u @l_rusr@
       opService imapd enable yes || exit 0
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to