xm/MIXBOX-ARCHIVE
1
0
Fork 0
mirror of https://github.com/monlor/MIXBOX-ARCHIVE.git synced 2026-03-15 09:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复vsftpd错误

Browse Source
This commit is contained in:
monlor
2020-03-07 13:48:53 +08:00
parent f61eb3528d
commit 4c56e56e10
3 changed files with 20 additions and 15 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

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

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

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

@@ -6,12 +6,18 @@ port=21
FTPUSER=${mbroot}/apps/vsftpd/config/ftpuser.conf FTPUSER=${mbroot}/apps/vsftpd/config/ftpuser.conf
# binname="${appname} ${appname}-ext" # binname="${appname} ${appname}-ext"
userpath=/etc/mixbox/apps/vsftpd/config/vsftpd.users userpath=/etc/mixbox/apps/vsftpd/config/vsftpd.users
[ "$entware" = '1' ] && configpath=/opt/etc/vsftpd/vsftpd.conf || configpath=/etc/vsftpd.conf configpath=/etc/vsftpd.conf
BINPATH=${mbroot}/apps/${appname}/bin/${appname}
if [ "$entware" = '1' ]; then
configpath=/opt/etc/vsftpd/vsftpd.conf
BINPATH=/opt/sbin/vsftpd
fi
[ ! -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
add(){ add(){
sed -i "/$1/"d /etc/passwd sed -i "/$1/"d /etc/passwd
sed -i "/$1/"d /etc/shadow sed -i "/$1/"d /etc/shadow
@@ -90,7 +96,6 @@ start () {
bincheck ${binname} bincheck ${binname}
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
logsh "【$service】" "安装程序成功，链接程序到工具箱..." logsh "【$service】" "安装程序成功，链接程序到工具箱..."
ln -sf $(which $binname) ${mbroot}/apps/${appname}/bin/${appname}
else else
logsh "【$service】" "程序安装失败！" logsh "【$service】" "程序安装失败！"
end end
@@ -101,7 +106,7 @@ start () {
open_port open_port
write_firewall_start write_firewall_start
daemon ${mbroot}/apps/${appname}/bin/${appname} daemon $BINPATH
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
logsh "【$service】" "启动${appname}服务失败！" logsh "【$service】" "启动${appname}服务失败！"
else else