diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index 9de4366fcc..467fc0fe2b 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -74,6 +74,7 @@ end if nixio.fs.access("/usr/bin/dnscrypt-proxy") then o:value("5", translate("Use dnscrypt-proxy query and cache")) end +o:value("6", translate("Use system settings")) o.default = 1 o = s:option(Value, "tunnel_forward", translate("Anti-pollution DNS Server")) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 06d4841da0..f10cf8abff 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -881,38 +881,29 @@ start() { if rules ;then [ $HAPROXY_MODE = "1" ] && start_haproxy && haproxy_enable=1 - start_redir - mkdir -p /tmp/dnsmasq.d - - if ! [ "$run_mode" = "oversea" ]; then - for domain_names in $(uci -X show shadowsocksr | grep domain_white_list | awk -F'[.=]' '{print $2}'); do - local DOMAIN_NANES=$(uci_get_by_name $domain_names domain_names) - - sed -i "/$DOMAIN_NANES/d" /etc/dnsmasq.ssr/custom_forward.conf - sed -i "/$DOMAIN_NANES/d" /etc/dnsmasq.ssr/gfw_base.conf - sed -i "/$DOMAIN_NANES/d" /etc/dnsmasq.ssr/gfw_list.conf - done - - sleep 2 - - cat > /tmp/dnsmasq.d/dnsmasq-ssr.conf < /tmp/dnsmasq.d/dnsmasq-ssr.conf < /tmp/dnsmasq.d/dnsmasq-ssr.conf < /tmp/dnsmasq.d/dnsmasq-ssr.conf </dev/null 2>&1 fi - - /etc/init.d/dnsmasq restart >/dev/null 2>&1 fi start_server