diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index a4b2391e4..e1de85760 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -45,8 +45,7 @@ function trojan_shadowsocks() address = server.server, port = tonumber(server.server_port), password = server.password, - method = (server.v2ray_protocol == "shadowsocks") and server.encrypt_method_ss or nil, - method = (server.v2ray_protocol == "shadowsocksr") and server.encrypt_method or nil, + method = ((server.v2ray_protocol == "shadowsocks") and server.encrypt_method_ss) or ((server.v2ray_protocol == "shadowsocksr") and server.encrypt_method) or nil, uot = (server.v2ray_protocol == "shadowsocks") and (server.uot == '1') or nil, ivCheck = (server.v2ray_protocol == "shadowsocks") and (server.ivCheck == '1') or nil, flow = (server.v2ray_protocol == "trojan") and (server.xtls == '1') and (server.vless_flow and server.vless_flow or "xtls-rprx-splice") or nil @@ -56,9 +55,9 @@ function trojan_shadowsocks() if server.v2ray_protocol == "shadowsocksr" then server.v2ray_protocol = "shadowsocks" - elseif (server.v2ray_protocol == "shadowsocks") and (server.mux ~= "1") and (not (outbound_settings.plugin or server.transport ~= "tcp" or server.tls or server.xtls)) then - server.v2ray_protocol = "shadowsocks_sing" - outbound_settings = outbound_settings.servers[1] + -- elseif (server.v2ray_protocol == "shadowsocks") and (server.mux ~= "1") and (not (outbound_settings.plugin or server.transport ~= "tcp" or server.tls or server.xtls)) then + -- server.v2ray_protocol = "shadowsocks_sing" + -- outbound_settings = outbound_settings.servers[1] elseif (server.v2ray_protocol == "trojan") and (server.tls and server.mux ~= "1") and (not (server.transport ~= "tcp" or server.xtls)) then server.v2ray_protocol = "trojan_sing" outbound_settings = outbound_settings.servers[1] diff --git a/my-default-settings/files/etc/uci-defaults/99-default-settings b/my-default-settings/files/etc/uci-defaults/99-default-settings index a3b22e4cf..ba38532b5 100644 --- a/my-default-settings/files/etc/uci-defaults/99-default-settings +++ b/my-default-settings/files/etc/uci-defaults/99-default-settings @@ -27,17 +27,6 @@ sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files echo $(uci -q get uhttpd.main.index_page) | grep -q "cgi-bin/luci" || uci -q add_list uhttpd.main.index_page='cgi-bin/luci' && uci commit uhttpd - -[ -f /etc/nginx/conf.d/luci.locations ] && ! grep -q "return 301" /etc/nginx/conf.d/luci.locations && { -echo ' -location ~* ^/cgi-bin/(.*) { - return 307 $scheme://$http_host/$1$is_args$args; -} -location = / { - return 301 $scheme://$http_host/luci/; -} -' >>/etc/nginx/conf.d/luci.locations - /etc/init.d/wizard disable [ -f /usr/bin/wget ] && diff --git a/my-default-settings/files/usr/lib/lua/luci/view/admin_status/index/links.htm b/my-default-settings/files/usr/lib/lua/luci/view/admin_status/index/links.htm new file mode 100644 index 000000000..64b1c0023 --- /dev/null +++ b/my-default-settings/files/usr/lib/lua/luci/view/admin_status/index/links.htm @@ -0,0 +1,14 @@ +<% if luci.sys.exec("echo -n `uci -q get base_config.@status[0].links`") ~= "0" then %> + +<%end%>