diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index 95d221875d..cffa00c9ba 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vssr -PKG_VERSION:=1.09 -PKG_RELEASE:=20200217-4 +PKG_VERSION:=1.10 +PKG_RELEASE:=20200219-4 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua index a68e2274ce..6ac5797abb 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua @@ -1,7 +1,7 @@ -- Copyright (C) 2017 yushi studio -- Licensed to the public under the GNU General Public License v3. -local IPK_Version="20200217.1.08" +local IPK_Version="20200219.1.10" local m, s, o local redir_run=0 local reudp_run=0 diff --git a/package/ctcgfw/luci-app-vssr/root/etc/config/vssr b/package/ctcgfw/luci-app-vssr/root/etc/config/vssr index 1ca2772aa5..7085e95e94 100644 --- a/package/ctcgfw/luci-app-vssr/root/etc/config/vssr +++ b/package/ctcgfw/luci-app-vssr/root/etc/config/vssr @@ -1,5 +1,7 @@ + + config global option tunnel_forward '8.8.4.4:53' option tunnel_address '0.0.0.0' @@ -7,23 +9,25 @@ config global option pdnsd_enable '1' option monitor_enable '1' option global_server 'nil' - option enable_switch '1' - option switch_timeout '5' - option switch_time '667' - option switch_try_count '3' option adblock '0' option adblock_url 'https://gitee.com/privacy-protection-tools/anti-ad/raw/master/easylist.txt' + option enable_switch '1' + option switch_timeout '5' + option switch_try_count '3' + option switch_time '667' config socks5_proxy option server 'nil' option local_port '1080' option local_address '0.0.0.0' + option http_enable '0' + option http_port '1081' config global_haproxy - option admin_enable '1' option admin_port '1111' option admin_user 'admin' option admin_password 'root' + option admin_enable '0' config access_control option wan_bp_list '/etc/china_ssr.txt' @@ -41,8 +45,7 @@ config server_global config server_subscribe option proxy '0' option auto_update_time '2' - option auto_update '1' - + option auto_update '0' config udp2raw option server '127.0.0.1' @@ -71,3 +74,4 @@ config udpspeeder + diff --git a/package/ctcgfw/luci-app-vssr/root/etc/hotplug.d/iface/22-vssr b/package/ctcgfw/luci-app-vssr/root/etc/hotplug.d/iface/22-vssr new file mode 100644 index 0000000000..b311447c60 --- /dev/null +++ b/package/ctcgfw/luci-app-vssr/root/etc/hotplug.d/iface/22-vssr @@ -0,0 +1,21 @@ +#!/bin/sh +# Copyright (C) 2007 OpenWrt.org + +/etc/init.d/vssr enabled && { + + [ "$ACTION" = "ifup" ] && { + local_server=`uci get vssr.@global[0].global_server 2>/dev/null` + + if [ "$local_server" = "nil" ] ;then + echo "$(date "+%Y-%m-%d %H:%M:%S") Shadowsocks/ShadowsocksR/v2ray not running!" >> /tmp/vssr.log + else + icount=`ps -w | grep ssr-retcp |grep -v grep| wc -l` + if [ $icount = 0 ] ;then + echo "$(date "+%Y-%m-%d %H:%M:%S") Shadowsocks/ShadowsocksR/v2ray/Trojan error.restart!" >> /tmp/vssr.log + /etc/init.d/vssr restart + exit 0 + fi + fi + } + +} \ No newline at end of file diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/GeoLite2-Country.mmdb b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/GeoLite2-Country.mmdb index 4b6385d1a6..1313c9a28c 100755 Binary files a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/GeoLite2-Country.mmdb and b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/GeoLite2-Country.mmdb differ