--- etc/init.d/pure-ftpd.orig 2011-07-11 11:28:00.000000000 +0200 +++ etc/init.d/pure-ftpd 2011-07-18 16:41:04.824488813 +0200 @@ -5,6 +5,7 @@ ftpd_pidfile="/var/run/pure-ftpd.pid" script_pidfile="/var/run/pure-uploadscript.pid" +authd_pidfile="/var/run/pure-authd.pid" ftpd_rundir="/var/lib/run/pure-ftpd" depend() { @@ -35,24 +36,20 @@ fi UPSCRIPT="" - OKNODO="" if [ -n "$UPLOADSCRIPT" ] ; then UPSCRIPT="--uploadscript" - OKNODO="--oknodo" + ebegin "Starting Pure-FTPd upload script" + start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background ${WAIT} -- -r $UPLOADSCRIPT + eend $? fi + if [ -n "$EXTAUTH_SCRIPT" ] ; then + ebegin "Starting Pure-FTPd extauth daemon" + start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${authd_pidfile} --exec /usr/sbin/pure-authd -- -s $EXTAUTH_SOCK -r $EXTAUTH_SCRIPT + eend $? + fi ebegin "Starting Pure-FTPd" start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd ${WAIT} -- --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" - else - eend $result - if [ -n "$UPLOADSCRIPT" ] ; then - ebegin "Starting Pure-FTPd upload script" - start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background ${WAIT} -- -r $UPLOADSCRIPT - eend $? - fi - fi + eend $? } stop() { @@ -64,7 +61,11 @@ start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile} eend $? fi - + if [ -n "$EXTAUTH_SCRIPT" ] ; then + ebegin "Stopping Pure-FTPd extauth daemon" + start-stop-daemon --stop --retry 20 --quiet --pidfile ${authd_pidfile} + eend $? + fi if ${TMPFS_MOUNT:-false} && mount | grep -q ${ftpd_rundir} ; then umount ${ftpd_rundir} >/dev/null 2>&1 fi