Browse Source

Update Pureftpd

lj2007331 8 years ago
parent
commit
d5c80e0f36
3 changed files with 79 additions and 10 deletions
  1. 5 7
      include/pureftpd.sh
  2. 71 0
      init.d/Pureftpd-init
  3. 3 3
      versions.txt

+ 5 - 7
include/pureftpd.sh

@@ -27,15 +27,13 @@ if [ -e "$pureftpd_install_dir/sbin/pure-ftpwho" ];then
     cp configuration-file/pure-config.pl $pureftpd_install_dir/sbin
     sed -i "s@/usr/local/pureftpd@$pureftpd_install_dir@" $pureftpd_install_dir/sbin/pure-config.pl
     chmod +x $pureftpd_install_dir/sbin/pure-config.pl
-    cp contrib/redhat.init /etc/init.d/pureftpd
-    sed -i "s@fullpath=.*@fullpath=$pureftpd_install_dir/sbin/\$prog@" /etc/init.d/pureftpd
-    sed -i "s@pureftpwho=.*@pureftpwho=$pureftpd_install_dir/sbin/pure-ftpwho@" /etc/init.d/pureftpd
-    sed -i "s@/etc/pure-ftpd.conf@$pureftpd_install_dir/etc/pure-ftpd.conf@" /etc/init.d/pureftpd
+    cd ../../
+    /bin/cp init.d/Pureftpd-init /etc/init.d/pureftpd 
+    sed -i "s@/usr/local/pureftpd@$pureftpd_install_dir@g" /etc/init.d/pureftpd
     chmod +x /etc/init.d/pureftpd
     [ "$OS" == 'CentOS' ] && { chkconfig --add pureftpd; chkconfig pureftpd on; }
-    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && { sed -i 's@^. /etc/rc.d/init.d/functions@. /lib/lsb/init-functions@' /etc/init.d/pureftpd; [ -z "`grep ^'# Default-Start' /etc/init.d/pureftpd`" ] && sed -i "s@^# chkconfig.*@# chkconfig&\n# Default-Start: 2 3 4 5\n# Default-Stop: 0 1 6@" /etc/init.d/pureftpd; update-rc.d pureftpd defaults; }
+    [[ $OS =~ ^Ubuntu$|^Debian$ ]] && { sed -i 's@^. /etc/rc.d/init.d/functions@. /lib/lsb/init-functions@' /etc/init.d/pureftpd; update-rc.d pureftpd defaults; }
     [ "$Debian_version" == '7' ] && sed -i 's@/var/lock/subsys/@/var/lock/@g' /etc/init.d/pureftpd
-    cd ../../
 
     /bin/cp config/pure-ftpd.conf $pureftpd_install_dir/etc
     sed -i "s@^PureDB.*@PureDB  $pureftpd_install_dir/etc/pureftpd.pdb@" $pureftpd_install_dir/etc/pure-ftpd.conf
@@ -59,7 +57,7 @@ if [ -e "$pureftpd_install_dir/sbin/pure-ftpwho" ];then
     fi
 else
     rm -rf $pureftpd_install_dir
-    echo "${CFAILURE}Pure-Ftp install failed, Please contact the author! ${CEND}"
+    echo "${CFAILURE}Pure-Ftpd install failed, Please contact the author! ${CEND}"
     kill -9 $$
 fi
 }

+ 71 - 0
init.d/Pureftpd-init

@@ -0,0 +1,71 @@
+#!/bin/bash
+#
+# Startup script for the pure-ftpd FTP Server  $Revision: 1.3 $
+#
+# chkconfig: 2345 85 15
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# description: Pure-FTPd is an FTP server daemon based upon Troll-FTPd
+# processname: pure-ftpd
+# pidfile: /var/run/pure-ftpd.pid
+# config: /usr/local/pureftpd/etc/pure-ftpd.conf
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+# Path to the pure-ftp binaries.
+prog=pure-config.pl
+fullpath=/usr/local/pureftpd/sbin/$prog
+pureftpwho=/usr/local/pureftpd/sbin/pure-ftpwho
+pure_config=/usr/local/pureftpd/etc/pure-ftpd.conf
+
+
+start() {
+	echo -n $"Starting $prog: "
+	$fullpath $pure_config --daemonize
+	RETVAL=$?
+	[ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+	echo
+}
+stop() {
+	echo -n $"Stopping $prog: "
+	kill $(cat /var/run/pure-ftpd.pid)
+	RETVAL=$?
+	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog
+	echo
+}
+
+# See how we were called.
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		if [ -f /var/lock/subsys/$prog ] ; then
+			stop
+			# avoid race
+			sleep 3
+			start
+		fi
+		;;
+	status)
+		status $prog
+		RETVAL=$?
+		if [ -f $pureftpwho ] && [ $RETVAL -eq 0 ] ; then
+			$pureftpwho
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|restart|condrestart|status}"
+		RETVAL=1
+esac
+exit $RETVAL

+ 3 - 3
versions.txt

@@ -22,7 +22,7 @@ mysql_5_5_version=5.5.51
 
 mariadb_10_1_version=10.1.16
 mariadb_10_0_version=10.0.26
-mariadb_5_5_version=5.5.50
+mariadb_5_5_version=5.5.51
 
 percona_5_7_version=5.7.13-6
 percona_5_6_version=5.6.31-77.0
@@ -48,13 +48,13 @@ imagick_version=3.4.1
 GraphicsMagick_version=1.3.24
 gmagick_version=1.1.7RC3
 libiconv_version=1.14
+curl_version=7.35.0
 libmcrypt_version=2.5.8
 mcrypt_version=2.6.8
 mhash_version=0.9.9.9
-curl_version=7.35.0
 
 # Ftp
-pureftpd_version=1.0.42
+pureftpd_version=1.0.43
 
 # Redis
 redis_version=3.2.3