X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pure-ftpd.init;h=e92e0501d4173ee678f54c8370af72b0c08b1b42;hb=cdcb87f6cc562059ab471b4abd1d47d33b755134;hp=22930ab36571b18d92699cc9feec0bec92f9bd47;hpb=8d60cf002bd570b492afac7ce97b8c2b63754dd9;p=packages%2Fpure-ftpd.git

diff --git a/pure-ftpd.init b/pure-ftpd.init
index 22930ab..e92e050 100644
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -12,13 +12,20 @@
 # Get network config
 . /etc/sysconfig/network
 
+PURE_FTPD_CONF=/etc/ftpd/pureftpd.conf
+[ -f /etc/pure-ftpd/conf/pureftpd.conf ] && PURE_FTPD_CONF=/etc/pure-ftpd/conf/pureftpd.conf
+
+PURE_AUTH_SCRIPT=/etc/pure-ftpd/authd/auth.script
+PURE_AUTH_SOCKET=/var/run/pure-authd/socket
+PURE_CERT_SCRIPT=/etc/pure-ftpd/certd/cert.script
+PURE_CERT_SOCKET=/var/run/pure-certd/socket
+
 # Get service config
 [ -f /etc/sysconfig/pure-ftpd ] && . /etc/sysconfig/pure-ftpd
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network ]; then
-		# nls "ERROR: Networking is down. %s can't be run." <service>
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
 		msg_network_down pure-ftpd
 		exit 1
 	fi
@@ -26,48 +33,119 @@ else
 	exit 0
 fi
 
-
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/pure-ftpd ]; then
-		msg_starting pure-ftpd
-		rm -f /var/run/pure-ftpd/client*
-		daemon pure-config.pl /etc/ftpd/pureftpd.conf --daemonize
-		RETVAL=$?
+		RETVAL=0
+		if [ -x "$PURE_AUTH_SCRIPT" ]; then
+			PURE_AUTH=yes
+			msg_starting pure-authd
+
+			# 326/326 - authd/authd
+
+			mkdir -p /var/run/pure-authd
+			chown ftpauth:root /var/run/pure-authd
+			chmod 750 /var/run/pure-authd
+
+			daemon /usr/sbin/pure-authd --uid 326 --gid 326 --pid /var/run/pure-authd.pid \
+				--run "$PURE_AUTH_SCRIPT" --socket "$PURE_AUTH_SOCKET" --daemonize
+			RETVAL=$?
+		fi
+		if [ $RETVAL -eq 0 -a -x "$PURE_CERT_SCRIPT" ]; then
+			PURE_CERT=yes
+			msg_starting pure-certd
+
+			# 335/335 - certd/certd
+
+			mkdir -p /var/run/pure-certd
+			chown ftpcert:root /var/run/pure-certd
+			chmod 750 /var/run/pure-certd
+
+			daemon /usr/sbin/pure-certd --uid 335 --gid 335 --pid /var/run/pure-certd.pid \
+				--run "$PURE_CERT_SCRIPT" --socket "$PURE_CERT_SOCKET" --daemonize
+			RETVAL=$?
+		fi
+		if [ $RETVAL -eq 0 ]; then
+			msg_starting pure-ftpd
+			rm -f /var/run/pure-ftpd/client*
+			modprobe -s capability > /dev/null 2>&1
+			daemon /usr/sbin/pure-ftpd ${PURE_FTPD_CONF} \
+				$([ "$PURE_AUTH" = "yes" ] && echo "-lextauth:$PURE_AUTH_SOCKET") \
+				$([ "$PURE_CERT" = "yes" ] && echo "--extcert=$PURE_CERT_SOCKET") \
+				--daemonize
+			RETVAL=$?
+
+			if [ -n "$UPLOADSCRIPT" ]; then
+				msg_starting pure-uploadscript
+				UPLOADSCRIPTOPTS="-B -r $UPLOADSCRIPT"
+				[ -n "$UPLOADSCRIPT_UID" ] && UPLOADSCRIPTOPTS="$UPLOADSCRIPTOPTS -u $UPLOADSCRIPT_UID"
+				[ -n "$UPLOADSCRIPT_GID" ] && UPLOADSCRIPTOPTS="$UPLOADSCRIPTOPTS -g $UPLOADSCRIPT_GID"
+				daemon /usr/sbin/pure-uploadscript $UPLOADSCRIPTOPTS
+				RETVAL=$(($RETVAL+$?))
+			fi
+		else
+			msg_starting pure-ftpd
+			deltext
+			fail
+		fi
+
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/pure-ftpd
 	else
 		msg_already_running pure-ftpd
-		exit 1
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	# Stop daemons.
 	if [ -f /var/lock/subsys/pure-ftpd ]; then
+		if [ -n "$UPLOADSCRIPT" ]; then
+		    msg_stopping pure-uploadscript
+		    killproc pure-uploadscript
+		fi
+
+		if [ -x "$PURE_AUTH_SCRIPT" -o -r /var/run/pure-authd.pid ]; then
+			msg_stopping pure-authd
+			killproc pure-authd
+		fi
+
+		if [ -x "$PURE_CERT_SCRIPT" -o -r /var/run/pure-certd.pid ]; then
+			msg_stopping pure-certd
+			killproc pure-certd
+		fi
+
 		msg_stopping pure-ftpd
 		killproc pure-ftpd
+		
 		rm -f /var/lock/subsys/pure-ftpd > /dev/null 2>&1
 	else
 		msg_not_running pure-ftpd
-		exit 1
 	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   status)
 	status pure-ftpd
+	status pure-uploadscript
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 		pure-ftpwho
 	fi
-	exit $RETVAL
 	;;
-  restart|reload)
-	$0 stop
-	$0 start
+  restart|force-reload)
+	stop
+	start
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 	;;
 esac