1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

Add v2ray tracker and fix VPS domain address support

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-09-04 22:05:24 +02:00
parent a03847acbb
commit 556d980c6e
6 changed files with 175 additions and 41 deletions

View file

@ -18,7 +18,7 @@ config defaults 'defaults'
option type 'ping'
option options ''
config shadowsocks 'shadowsocks'
config proxy 'proxy'
option enabled '1'
list hosts '1.1.1.1'
list hosts '1.0.0.1'

View file

@ -143,7 +143,7 @@ _launch_shadowsocks_tracker() {
[ "$1" = "tracker" ] || return
_validate_section "shadowsocks" "shadowsocks"
_validate_section "proxy" "proxy"
config_get local_port "$1" local_port
local disabled
@ -167,6 +167,26 @@ _launch_shadowsocks_tracker() {
procd_close_instance
}
_launch_v2ray_tracker() {
local hosts timeout tries interval local_port enabled server
_validate_section "proxy" "proxy"
[ "$enabled" = "0" ] || [ -z "$hosts" ] && return
procd_open_instance
# shellcheck disable=SC2086
procd_set_param command /bin/omr-tracker-ss "$1"
procd_append_param env "OMR_TRACKER_HOSTS=$hosts"
procd_append_param env "OMR_TRACKER_TIMEOUT=$timeout"
procd_append_param env "OMR_TRACKER_TRIES=$tries"
procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:1111"
procd_set_param limits nofile="51200 51200"
procd_set_param respawn 0 10 0
procd_set_param stderr 1
procd_close_instance
}
_multi_server() {
config_get backup $1 backup
[ "$backup" = "1" ] && multiserver=true
@ -187,6 +207,11 @@ start_service() {
#elif [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then
# /etc/init.d/shadowsocks-libev rules_down
fi
config_load v2ray
config_get v2rayenabled main enabled
if [ "$v2rayenabled" = "1" ]; then
_launch_v2ray_tracker
fi
multiserver=false
config_load openmptcprouter

View file

@ -23,16 +23,24 @@ if [ "$(uci -q get omr-tracker.defaults.interval_tries)" = "" ]; then
commit omr-tracker
EOF
fi
if [ "$(uci -q get omr-tracker.shadowsocks.hosts | grep '23.96.52.53')" != "" ]; then
if [ "$(uci -q get omr-tracker.shadowsocks)" != "" ]; then
uci -q batch <<-EOF >/dev/null
del_list omr-tracker.shadowsocks.hosts='23.96.52.53'
del_list omr-tracker.shadowsocks.hosts='104.40.211.35'
del_list omr-tracker.shadowsocks.hosts='80.67.169.12'
add_list omr-tracker.shadowsocks.hosts='104.16.1.1'
add_list omr-tracker.shadowsocks.hosts='103.224.182.242'
add_list omr-tracker.shadowsocks.hosts='198.27.92.1'
add_list omr-tracker.shadowsocks.hosts='88.191.250.176'
add_list omr-tracker.shadowsocks.hosts='151.101.129.164'
rename omr-tracker.shadowsocks=proxy
uci set omr-tracker.proxy=proxy
EOF
fi
if [ "$(uci -q get omr-tracker.proxy.hosts | grep '23.96.52.53')" != "" ]; then
uci -q batch <<-EOF >/dev/null
del_list omr-tracker.proxy.hosts='23.96.52.53'
del_list omr-tracker.proxy.hosts='104.40.211.35'
del_list omr-tracker.proxy.hosts='80.67.169.12'
add_list omr-tracker.proxy.hosts='104.16.1.1'
add_list omr-tracker.proxy.hosts='103.224.182.242'
add_list omr-tracker.proxy.hosts='198.27.92.1'
add_list omr-tracker.proxy.hosts='88.191.250.176'
add_list omr-tracker.proxy.hosts='151.101.129.164'
EOF
fi
exit 0