diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 52acb40ff..d81382b4a 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 -PKG_VERSION:=1.30-1 +PKG_VERSION:=1.30-2 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/controller/passwall2.lua b/luci-app-passwall2/luasrc/controller/passwall2.lua index b5c0bdee8..ed5d250d0 100644 --- a/luci-app-passwall2/luasrc/controller/passwall2.lua +++ b/luci-app-passwall2/luasrc/controller/passwall2.lua @@ -22,7 +22,7 @@ function index() entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true local e if uci:get(appname, "@global[0]", "hide_from_luci") ~= "1" then - e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1) + e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("PassWall 2"), -1) else e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), nil, -1) end diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/haproxy.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/haproxy.lua index f15240250..be9cfbc07 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/haproxy.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/haproxy.lua @@ -48,6 +48,7 @@ o:depends("balancing_enable", true) o = s:option(Flag, "bind_local", translate("Haproxy Port") .. " " .. translate("Bind Local"), translate("When selected, it can only be accessed localhost.")) o.default = "0" +o:depends("balancing_enable", true) ---- Health Check Type o = s:option(ListValue, "health_check_type", translate("Health Check Type")) diff --git a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua index 66fb3b6ff..9e4984392 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua @@ -1163,8 +1163,7 @@ function gen_config(var) elseif w:find("full:") == 1 then table.insert(domain_table.domain, w:sub(1 + #"full:")) elseif w:find("domain:") == 1 then - table.insert(domain_table.domain, w:sub(1 + #"domain:")) - table.insert(domain_table.domain_suffix, "." .. w:sub(1 + #"domain:")) + table.insert(domain_table.domain_suffix, w:sub(1 + #"domain:")) else table.insert(domain_table.domain_keyword, w) end diff --git a/luci-app-passwall2/root/etc/init.d/passwall2 b/luci-app-passwall2/root/etc/init.d/passwall2 index 8f07ae3cb..5a3c49829 100755 --- a/luci-app-passwall2/root/etc/init.d/passwall2 +++ b/luci-app-passwall2/root/etc/init.d/passwall2 @@ -32,7 +32,7 @@ unlock() { done } -boot() { +boot_func() { local delay=$(uci -q get ${CONFIG}.@global_delay[0].start_delay || echo 1) if [ "$delay" -gt 0 ]; then $APP_FILE echolog "执行启动延时 $delay 秒后再启动!" @@ -42,6 +42,10 @@ boot() { touch ${LOCK_FILE_DIR}/${CONFIG}_ready.lock } +boot() { + boot_func >/dev/null 2>&1 & +} + start() { set_lock [ $? == 1 ] && $APP_FILE echolog "脚本已经在运行,不重复运行,退出." && exit 0