xm/MIXBOX-ARCHIVE
1
0
Fork 0
mirror of https://github.com/monlor/MIXBOX-ARCHIVE.git synced 2026-03-10 23:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复vsftpd脚本错误

Browse Source
This commit is contained in:
monlor
2020-03-07 13:17:04 +08:00
parent a72748e721
commit f61eb3528d
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/vsftpd/config/mixbox.conf
View File

@@ -53,10 +53,10 @@ vsftpd() {
[ "$res" == '1' ] && vsftpdAdd [ "$res" == '1' ] && vsftpdAdd
read -p "删除${appname}用户？[1/0] " res read -p "删除${appname}用户？[1/0] " res
[ "$res" == '1' ] && vsftpdDel [ "$res" == '1' ] && vsftpdDel
if [ "$(mbdb get entware.main.enable)" = '1' ]; then # if [ "$(mbdb get entware.main.enable)" = '1' ]; then
readsh "使用entware安装插件程序[1/0]" "entware" "1" # readsh "使用entware安装插件程序[1/0]" "entware" "1"
# [ "$entware" = '1' ] && mv ${mbroot}/apps/${appname}/bin/${appname} ${mbroot}/apps/${appname}/bin/${appname}.bak &> /dev/null # # [ "$entware" = '1' ] && mv ${mbroot}/apps/${appname}/bin/${appname} ${mbroot}/apps/${appname}/bin/${appname}.bak &> /dev/null
fi # fi
readsh "请输入${appname}外网访问配置[1/0]" "openport" "1" readsh "请输入${appname}外网访问配置[1/0]" "openport" "1"
${mbroot}/apps/${appname}/scripts/${appname}.sh restart ${mbroot}/apps/${appname}/scripts/${appname}.sh restart

1
apps/vsftpd/config/version.txt
View File

@@ -1 +0,0 @@
1.1.6

4
apps/vsftpd/config/vsftpd.uci
View File

@@ -4,5 +4,5 @@ needver="0.0.1"
supports="linux_arm,linux_mips,linux_x86_64" supports="linux_arm,linux_mips,linux_x86_64"
backupfiles="config/ftpuser.conf" backupfiles="config/ftpuser.conf"
appinfo="快速搭建Ftp服务器，局域网文件共享" appinfo="快速搭建Ftp服务器，局域网文件共享"
newinfo="" newinfo="修复vsftpd脚本错误"
version="0.0.3" version="0.0.4"

6
apps/vsftpd/scripts/vsftpd.sh
View File

@@ -11,7 +11,6 @@ userpath=/etc/mixbox/apps/vsftpd/config/vsftpd.users
[ ! -d /var/run/vsftpd ] && mkdir -p /var/run/vsftpd [ ! -d /var/run/vsftpd ] && mkdir -p /var/run/vsftpd
[ -z "$port" ] && port=21 [ -z "$port" ] && port=21
[ -z "$anon_root" ] && anon_root=/var/ftp [ -z "$anon_root" ] && anon_root=/var/ftp
[ ! -f "${configpath}" ] && touch ${configpath}
add(){ add(){
sed -i "/$1/"d /etc/passwd sed -i "/$1/"d /etc/passwd
@@ -74,7 +73,7 @@ set_config() {
anon_enable=NO anon_enable=NO
fi fi
mount --bind ${mbroot}/apps/${appname}/config/${appname}.conf ${configpath} cp -rf ${mbroot}/apps/${appname}/config/${appname}.conf ${configpath}
echo -e "anonymous_enable=$anon_enable\nanon_root=$anon_root\nlisten_port=${port}" >> ${configpath} echo -e "anonymous_enable=$anon_enable\nanon_root=$anon_root\nlisten_port=${port}" >> ${configpath}
} }
@@ -121,8 +120,9 @@ stop () {
do do
[ ! -z "${line}" ] && del ${line} [ ! -z "${line}" ] && del ${line}
done done
rm -rf ${configpath}
killall -9 ${appname} &> /dev/null killall -9 ${appname} &> /dev/null
rm -rf ${configpath}
} }