Browse Source

Fix pureftpd

lj2007331 8 years ago
parent
commit
219c47c2f0
4 changed files with 4 additions and 9 deletions
  1. 1 3
      config/pure-ftpd.conf
  2. 0 3
      include/pureftpd.sh
  3. 2 2
      init.d/Pureftpd-init
  4. 1 1
      versions.txt

+ 1 - 3
config/pure-ftpd.conf

@@ -123,7 +123,7 @@ MaxIdleTime                 15
 
 # PureDB user database (see README.Virtual-Users)
 
-PureDB                        /usr/local/pureftpd/etc/pureftpd.pdb
+PureDB                          /usr/local/pureftpd/etc/pureftpd.pdb
 
 
 # Path to pure-authd socket (see README.Authentication-Modules)
@@ -442,5 +442,3 @@ CustomerProof              yes
 
 # FileSystemCharset big5
 # ClientCharset     big5
-AllowOverwrite on
-AllowStoreRestart on

+ 0 - 3
include/pureftpd.sh

@@ -21,10 +21,7 @@ Install_PureFTPd() {
   make -j ${THREAD} && make install
   if [ -e "${pureftpd_install_dir}/sbin/pure-ftpwho" ]; then
     [ ! -e "${pureftpd_install_dir}/etc" ] && mkdir ${pureftpd_install_dir}/etc
-    /bin/cp configuration-file/pure-config.pl ${pureftpd_install_dir}/sbin
     popd
-    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
     /bin/cp ../init.d/Pureftpd-init /etc/init.d/pureftpd
     /bin/cp ../config/pure-ftpd.conf ${pureftpd_install_dir}/etc
     sed -i "s@/usr/local/pureftpd@${pureftpd_install_dir}@g" /etc/init.d/pureftpd

+ 2 - 2
init.d/Pureftpd-init

@@ -25,12 +25,12 @@ RETVAL=0
 
 # Path to the pure-ftp binaries.
 prog=pure-ftpd
-fullpath=/usr/local/pureftpd/sbin/pure-config.pl
+fullpath=/usr/local/pureftpd/sbin/$prog
 pure_config=/usr/local/pureftpd/etc/pure-ftpd.conf
 
 start() {
   echo -n $"Starting $prog: "
-  $fullpath $pure_config --daemonize
+  $fullpath $pure_config
   RETVAL=$?
   [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
   echo

+ 1 - 1
versions.txt

@@ -90,5 +90,5 @@ tmux_version=2.3
 htop_version=2.0.2
 bison_version=2.7.1
 python_version=2.7.13
-setuptools_version=34.1.1
+setuptools_version=32.0.0
 pip_version=9.0.1