diff --git a/apps/aliddns/bin/aliddns_darwin_x86_64 b/apps/aliddns/bin/aliddns_darwin_x86_64 old mode 100644 new mode 100755 index 0eb0af8..d8a3096 Binary files a/apps/aliddns/bin/aliddns_darwin_x86_64 and b/apps/aliddns/bin/aliddns_darwin_x86_64 differ diff --git a/apps/aliddns/bin/aliddns_linux_aarch64 b/apps/aliddns/bin/aliddns_linux_aarch64 index 593f10f..73fa043 100755 Binary files a/apps/aliddns/bin/aliddns_linux_aarch64 and b/apps/aliddns/bin/aliddns_linux_aarch64 differ diff --git a/apps/aliddns/bin/aliddns_linux_arm b/apps/aliddns/bin/aliddns_linux_arm index 593f10f..73fa043 100755 Binary files a/apps/aliddns/bin/aliddns_linux_arm and b/apps/aliddns/bin/aliddns_linux_arm differ diff --git a/apps/aliddns/bin/aliddns_linux_mips b/apps/aliddns/bin/aliddns_linux_mips index 456e8e3..f380c4b 100755 Binary files a/apps/aliddns/bin/aliddns_linux_mips and b/apps/aliddns/bin/aliddns_linux_mips differ diff --git a/apps/aliddns/bin/aliddns_linux_x86_64 b/apps/aliddns/bin/aliddns_linux_x86_64 index a5d7f7b..856bdac 100755 Binary files a/apps/aliddns/bin/aliddns_linux_x86_64 and b/apps/aliddns/bin/aliddns_linux_x86_64 differ diff --git a/apps/aliddns/config/aliddns.uci b/apps/aliddns/config/aliddns.uci index dcea784..d7647d2 100644 --- a/apps/aliddns/config/aliddns.uci +++ b/apps/aliddns/config/aliddns.uci @@ -3,5 +3,5 @@ appname="aliddns" needver="0.0.1" supports="linux_aarch64,linux_arm,linux_mips,linux_x86_64,darwin_x86_64" appinfo="动态将你的路由器IP绑定到域名" -newinfo="" -version="0.0.2" +newinfo="支持ipv6" +version="0.0.3" diff --git a/apps/aliddns/config/mixbox.conf b/apps/aliddns/config/mixbox.conf deleted file mode 100644 index 8de051f..0000000 --- a/apps/aliddns/config/mixbox.conf +++ /dev/null @@ -1,28 +0,0 @@ -#------------------【AliDDNS】-------------------- -aliddns() { - - eval `mbdb export aliddns` - source /etc/mixbox/bin/base - echo "********* $service ***********" - echo "[${appinfo}]" - readsh "启动${appname}服务[1/0] " "enable" "1" - - if [ "$enable" == '1' ]; then - # Scripts Here - read -p "修改${appname}配置?[1/0] " res - if [ "$res" = '1' ]; then - readsh "请输入${appname}访问ID" "app_key" - readsh "请输入${appname}访问密钥" "app_secret" - readsh "请输入${appname}域名[例如@.mixbox.com或www.mixbox.com]" "domain" - readsh "请输入${appname}检查分钟间隔(建议10)" "time" "10" - fi - # read -p "更新DNS前先清除旧的DNS记录(默认不清除)?[1/0] " res - # mbdb set $appname.main.clean="$res" - - ${mbroot}/apps/${appname}/scripts/${appname}.sh restart - else - ${mbroot}/apps/${appname}/scripts/${appname}.sh stop - fi - -} -#------------------【AliDDNS】-------------------- diff --git a/apps/aliddns/config/version.txt b/apps/aliddns/config/version.txt deleted file mode 100644 index 90a27f9..0000000 --- a/apps/aliddns/config/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.0.5 diff --git a/apps/aliddns/scripts/aliddns.sh b/apps/aliddns/scripts/aliddns.sh index 5be7c2f..ced9c1e 100644 --- a/apps/aliddns/scripts/aliddns.sh +++ b/apps/aliddns/scripts/aliddns.sh @@ -6,15 +6,18 @@ start() { # [ -n "$(pidof ${appname})" ] && logsh "【$service】" "${appname}已经在运行!" && exit 1 logsh "【$service】" "正在启动${appname}服务... " - # Scripts Here + local extra_cmd="" # open_port # write_firewall_start [ -z "$app_key" -o -z "$app_secret" -o -z "$domain" ] && logsh "【$service】" "访问ID或密钥或域名为空!" && exit 1 [ -z "$time" ] && time=10 cru a "${appname}" "*/$time * * * * ${mbroot}/apps/${appname}/scripts/${appname}.sh restart" - daemon ${mbroot}/apps/${appname}/bin/${appname} --id "$app_key" --secret "$app_secret" auto-update --domain "$domain" + if [ "${ipv6}" = '1' ]; then + extra_cmd="&& ${mbroot}/apps/${appname}/bin/${appname} --id "$app_key" --secret "$app_secret" auto-update -6 --domain "$domain"" + fi + daemon ${mbroot}/apps/${appname}/bin/${appname} --id "$app_key" --secret "$app_secret" auto-update --domain "$domain" ${extra_cmd} if [ $? -ne 0 ]; then logsh "【$service】" "启动${appname}服务失败!" else diff --git a/apps/aliddns/scripts/config.sh b/apps/aliddns/scripts/config.sh new file mode 100644 index 0000000..343e094 --- /dev/null +++ b/apps/aliddns/scripts/config.sh @@ -0,0 +1,24 @@ +#!/bin/sh +#copyright by monlor + +eval `mbdb export aliddns` +source "$(mbdb get mixbox.main.path)"/bin/base +echo "********* $service ***********" +echo "[${appinfo}]" +readsh "启动${appname}服务[1/0] " "enable" "1" + +if [ "$enable" == '1' ]; then + # Scripts Here + read -p "修改${appname}配置?[1/0] " res + if [ "$res" = '1' ]; then + readsh "请输入${appname}访问ID" "app_key" + readsh "请输入${appname}访问密钥" "app_secret" + readsh "请输入${appname}域名[例如@.mixbox.com或www.mixbox.com]" "domain" + readsh "请输入${appname}检查分钟间隔(建议10)" "time" "10" + fi + readsh "启用ipv6支持[1/0]" "ipv6" "0" + + readsh "重启${appname}服务[1/0]" "res" "1" + [ "$res" != '0' ] && exit 0 +fi +exit 1 \ No newline at end of file diff --git a/apps/npc/scripts/config.sh b/apps/npc/scripts/config.sh index d1b03a4..e6e439b 100644 --- a/apps/npc/scripts/config.sh +++ b/apps/npc/scripts/config.sh @@ -7,11 +7,11 @@ echo "********* $service ***********" echo "[${appinfo}]" readsh "启动${appname}服务[1/0] " "enable" "1" if [ "$enable" == '1' ]; then - # Scripts Here - readsh "请输入npc连接命令:" "connect_cmd" + # Scripts Here + readsh "请输入npc连接命令:" "connect_cmd" - # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0" - readsh "重启${appname}服务[1/0] " "res" "1" - [ "$res" != '0' ] && exit 0 + # readsh "请输入${appname}外网访问配置[1/0]" "openport" "0" + readsh "重启${appname}服务[1/0] " "res" "1" + [ "$res" != '0' ] && exit 0 fi exit 1 \ No newline at end of file diff --git a/tools/newapp.sh b/tools/newapp.sh index bbd3e5e..eedd3e0 100755 --- a/tools/newapp.sh +++ b/tools/newapp.sh @@ -24,27 +24,23 @@ newinfo="" version="0.0.1" EOF echo "生成工具箱配置文件..." -cat > ${appname}/config/mixbox.conf < ${appname}/scripts/config.sh < ${appname}/scripts/${appname}.sh <<-EOF