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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   24-Jul-2003 15:55:32
  Branch: HEAD                             Handle: 2003072414553200

  Modified files:
    openpkg-src/pureftpd    rc.pureftpd

  Log:
    PR#202 run-time check and related issues

  Summary:
    Revision    Changes     Path
    1.16        +17 -3      openpkg-src/pureftpd/rc.pureftpd
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/pureftpd/rc.pureftpd
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 rc.pureftpd
  --- openpkg-src/pureftpd/rc.pureftpd  24 Jul 2003 07:03:17 -0000      1.15
  +++ openpkg-src/pureftpd/rc.pureftpd  24 Jul 2003 13:55:32 -0000      1.16
  @@ -5,6 +5,9 @@
   
   %config
       pureftpd_enable="$openpkg_rc_def"
  +    pureftpd_flags=""
  +    pureftpd_bind="127.0.0.1"
  +    pureftpd_port="21"
       pureftpd_log_prolog="true"
       pureftpd_log_epilog="true"
       pureftpd_log_numfiles="10"
  @@ -29,15 +32,26 @@
   %start -u @l_susr@
       rcService pureftpd enable yes || exit 0
       rcService pureftpd active yes && exit 0
  -    @l_prefix@/sbin/pure-ftpd </dev/null &
  -    echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
  +    flags="$pureftpd_flags"
  +    echo $flags | grep -- -S     >/dev/null; rc1=$?
  +    echo $flags | grep -- --bind >/dev/null; rc2=$?
  +    if [ $rc1 -ne 0 -a $rc2 -ne 0 ]; then
  +        if [ ".$pureftpd_bind" != . ]; then
  +            flags="$flags --bind $pureftpd_bind"
  +        else
  +            flags="$flags --bind 0.0.0.0"
  +        fi
  +        if [ ".$pureftpd_port" != . ]; then
  +            flags="$flags,$pureftpd_port"
  +        fi
  +    fi
  +    @l_prefix@/sbin/pure-ftpd --daemonize --pidfile $pureftpd_pidfile $flags
   
   %stop -u @l_susr@
       rcService pureftpd enable yes || exit 0
       rcService pureftpd active no  && exit 0
       pureftpd_signal TERM
       sleep 2
  -    rm -f $pureftpd_pidfile
   
   %restart -u @l_susr@
       rcService pureftpd enable yes || exit 0
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to