From 2aeac95bf5afc8788d2885bb73c3f06ac8dfbdde Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 19 Oct 2018 20:36:36 +0800 Subject: [PATCH] add blacklist IP and GFWlist can work at the same time --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 99a6b58e7..5ea3fba73 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for SSR Plus LUCI_DEPENDS:=+shadowsocksr-libev +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget LUCI_PKGARCH:=all PKG_VERSION:=1 -PKG_RELEASE:=17 +PKG_RELEASE:=18 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua index 5dd8cab01..5fdfdb775 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua @@ -14,7 +14,7 @@ function f.handle(self, state, data) if state == FORM_VALID then if data.conf then fs.writefile(conffile, data.conf:gsub("\r\n", "\n")) - luci.sys.call("/usr/share/shadowsocksr/gfw2ipset.sh && /etc/init.d/dnsmasq restart && ipset flush gfwlist") + luci.sys.call("/usr/share/shadowsocksr/gfw2ipset.sh && /etc/init.d/shadowsocksr restart") end end return true