diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-14 17:31:26 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-14 17:31:26 +0000 |
| commit | 59a7b204adf13b043c1b0096a330c941e16ea410 (patch) | |
| tree | a018693b28838e872fbed2f100bc93327bbb77e2 /net-ftp/pure-ftpd/files | |
| parent | Repacked in a tar ball to avoid conflicts with jsmath-extra-dark (diff) | |
| download | historical-59a7b204adf13b043c1b0096a330c941e16ea410.tar.gz historical-59a7b204adf13b043c1b0096a330c941e16ea410.tar.bz2 historical-59a7b204adf13b043c1b0096a330c941e16ea410.zip | |
Version bump, use pid variables in init script by Polynomial-C in bug #296864
Package-Manager: portage-2.2_rc59/cvs/Linux x86_64
Diffstat (limited to 'net-ftp/pure-ftpd/files')
| -rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd.rc7 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc7 b/net-ftp/pure-ftpd/files/pure-ftpd.rc7 index 84bcf21e0ebf..34918951f5f1 100644 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc7 +++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc7 @@ -1,7 +1,10 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.1 2009/11/23 12:59:07 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.2 2009/12/14 17:31:26 voyageur Exp $ + +ftpd_pidifle="/var/run/pure-ftpd.pid" +script_pidfile="/var/run/pure-uploadscript.pid" depend() { need net @@ -23,7 +26,7 @@ start() { OKNODO="--oknodo" fi ebegin "Starting Pure-FTPd" - start-stop-daemon --start --quiet --pidfile /var/run/pure-ftpd.pid $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile /var/run/pure-ftpd.pid $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT + start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT result=$? if [ $result -ne 0 ] ; then eend 1 "Could not launch Pure-FTPd" @@ -31,7 +34,7 @@ start() { eend $result if [ -n "$UPLOADSCRIPT" ] ; then ebegin "Starting Pure-FTPd upload script" - start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-uploadscript.pid --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT + start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT eend $? fi fi @@ -39,11 +42,11 @@ start() { stop() { ebegin "Stopping Pure-FTPd" - start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-ftpd.pid + start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile} eend $? if [ -n "$UPLOADSCRIPT" ] ; then ebegin "Stopping Pure-FTPd upload script" - start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-uploadscript.pid + start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile} eend $? fi } |