Преглед изворни кода

gfwlist: add v2fly/domain-list

Mattraks пре 5 година
родитељ
комит
401cfdb7cf

+ 2 - 1
luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua

@@ -56,9 +56,10 @@ o:depends("adblock", "1")
 o.description = translate("Support AdGuardHome and DNSMASQ format list")
 
 o = s:option(Value, "gfwlist_url", translate("gfwlist Update url"))
+o:value("https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt", translate("v2fly/domain-list-community"))
 o:value("https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt", translate("Loukky/gfwlist-by-loukky"))
 o:value("https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt", translate("gfwlist/gfwlist"))
-o.default = "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt"
+o.default = "https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt"
 
 o = s:option(Value, "chnroute_url", translate("Chnroute Update url"))
 o:value("https://ispip.clang.cn/all_cn.txt", translate("Clang.CN"))

+ 13 - 15
luci-app-ssr-plus/root/etc/config/shadowsocksr

@@ -1,23 +1,22 @@
 
 config global
-	option tunnel_forward '8.8.4.4:53'
-	option tunnel_address '0.0.0.0'
+	option global_server 'nil'
+	option netflix_server 'nil'
+	option netflix_proxy '0'
+	option threads '0'
 	option run_mode 'router'
 	option dports '2'
 	option pdnsd_enable '1'
+	option tunnel_forward '8.8.4.4:53'
 	option monitor_enable '1'
 	option enable_switch '1'
-	option switch_timeout '5'
 	option switch_time '667'
+	option switch_timeout '5'
 	option switch_try_count '3'
-	option gfwlist_url 'https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt'
+	option gfwlist_url 'https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt'
 	option chnroute_url 'https://ispip.clang.cn/all_cn.txt'
 	option nfip_url 'https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt'
 	option adblock_url 'https://anti-ad.net/anti-ad-for-dnsmasq.conf'
-	option threads '0'
-	option global_server 'disable'
-	option netflix_server 'nil'
-	option netflix_proxy '0'
 
 config access_control
 	option lan_ac_mode '0'
@@ -28,16 +27,15 @@ config access_control
 	list wan_fw_ips '91.108.56.0/22'
 	list wan_fw_ips '109.239.140.0/24'
 
+config server_subscribe
+	option proxy '0'
+	option auto_update_time '2'
+	option auto_update '1'
+	option filter_words '过期时间/剩余流量/QQ群/官网/防失联地址/回国'
+
 config socks5_proxy
 	option socks '0'
 	option local_port '1080'
-	option local_address '0.0.0.0'
 
 config server_global
 	option enable_server '0'
-
-config server_subscribe
-	option proxy '0'
-	option auto_update_time '2'
-	option auto_update '1'
-	option filter_words '过期时间/剩余流量/QQ群/官网/防失联地址/回国'

+ 1 - 1
luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua

@@ -40,7 +40,7 @@ local function update(url, file, type, file2)
 end
 
 log("正在更新【GFW列表】数据库")
-update(uci:get_first("shadowsocksr", "global", "gfwlist_url", "https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt"), "/etc/ssr/gfw_list.conf", "gfw_data", "/tmp/dnsmasq.ssr/gfw_list.conf")
+update(uci:get_first("shadowsocksr", "global", "gfwlist_url", "https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt"), "/etc/ssr/gfw_list.conf", "gfw_data", "/tmp/dnsmasq.ssr/gfw_list.conf")
 log("正在更新【国内IP段】数据库")
 update(uci:get_first("shadowsocksr", "global", "chnroute_url","https://ispip.clang.cn/all_cn.txt"), "/etc/ssr/china_ssr.txt", "cnip")
 if uci:get_first("shadowsocksr", "global", "adblock","0") == "1" then