fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add use system settings for AdGuardHome

Browse Source
This commit is contained in:
CN_SZTL 2019-07-04 17:48:49 +08:00
parent c0fc2efb8f
commit 3f06e082ea
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua
View File

@ -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"))

41
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -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 <<EOF
if ! [ "$(uci_get_by_type global pdnsd_enable)" = "6" ] ;then
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 <<EOF
conf-dir=/var/dnsmasq.ssr
EOF
cp -a /etc/dnsmasq.ssr /var
else
cat > /tmp/dnsmasq.d/dnsmasq-ssr.conf <<EOF
cp -a /etc/dnsmasq.ssr /var
else
cat > /tmp/dnsmasq.d/dnsmasq-ssr.conf <<EOF
conf-dir=/var/dnsmasq.oversea
EOF
cp -a /etc/dnsmasq.oversea /var
cp -a /etc/dnsmasq.oversea /var
fi
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
start_server