Revert "luci-app-ssr-plus:ssr-ad separate control use (#3592)"

This reverts commit 84bf3aadcd.
This commit is contained in:
LEAN-ESX 2020-03-07 19:42:46 -08:00
parent 2fa78823c4
commit 860a5d1e6a

View File

@ -524,9 +524,6 @@ start() {
conf-dir=/tmp/dnsmasq.oversea
EOF
fi
if [ -e "/tmp/dnsmasq.d/ad.conf" ]; then
rm -f /tmp/dnsmasq.d/ad.conf
fi
if [ $(uci_get_by_type global adblock 0) == "0" ]; then
rm -f /tmp/dnsmasq.ssr/ad.conf
fi
@ -582,14 +579,9 @@ stop() {
else
kill -9 $(busybox ps -w | grep pdnsd | grep -v grep | awk '{print $1}') >/dev/null 2>&1
fi
if [ $(uci_get_by_type global adblock 0) == "0" ]; then
rm -f /tmp/dnsmasq.d/ad.conf
else
cp -f /etc/dnsmasq.ssr/ad.conf /tmp/dnsmasq.d/ad.conf
fi
if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then
rm -f /tmp/dnsmasq.d/dnsmasq-ssr.conf
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
/etc/init.d/dnsmasq restart >/dev/null 2>&1
del_cron
}