mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

sync (#386)

Browse source
This commit is contained in:
suyuan 2023-12-04 17:27:20 +08:00 committed by GitHub
commit 224d5a3c96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
omr-tracker/files/bin/omr-tracker-server
View file

@ -81,6 +81,7 @@ _check_master() {
#logger -t "OMR-Tracker-Server" "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n') - $ip"
uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.sss${count}.server=$ip
set shadowsocks-rust.sss${count}.server=$ip
EOF
if [ "$count" -eq "0" ]; then
uci -q batch <<-EOF >/dev/null
@ -123,6 +124,8 @@ _check_master() {
fi
config_load shadowsocks-libev
config_foreach _enable_redir ss_redir
config_load shadowsocks-rust
config_foreach _enable_redir ss_redir
OMR_TRACKER_STATUS_MSG="Answer to ping and to API check"
mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@ -150,6 +153,8 @@ _check_master() {
EOF
config_load shadowsocks-libev
config_foreach _disable_redir ss_redir
config_load shadowsocks-rust
config_foreach _disable_redir ss_redir
mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
[ "$mail_alert" = "1" ] && [ -n "$(uci -q get mail.default.to)" ] && {
@ -178,7 +183,11 @@ _check_master() {
# config_foreach _enable_redir ss_redir
#fi
uci -q commit shadowsocks-libev
[ "$changes" = "1" ] && /etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
uci -q commit shadowsocks-rust
[ "$changes" = "1" ] && {
/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
}
break
}
}
@ -211,6 +220,7 @@ _check_backup() {
changes="1"
uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.sss${count}.server=$ip
set shadowsocks-rust.sss${count}.server=$ip
EOF
if [ "$count" -eq "0" ]; then
uci -q batch <<-EOF >/dev/null
@ -242,6 +252,7 @@ _check_backup() {
EOF
/etc/init.d/openmptcprouter-vps get_openvpn_key $name >/dev/null 2>/dev/null
/etc/init.d/v2ray restart >/dev/null 2>/dev/null
/etc/init.d/xray restart >/dev/null 2>/dev/null
/etc/init.d/glorytun restart >/dev/null 2>/dev/null
/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null
/etc/init.d/mlvpn restart >/dev/null 2>/dev/null
@ -253,6 +264,8 @@ _check_backup() {
fi
config_load shadowsocks-libev
config_foreach _enable_redir ss_redir
config_load shadowsocks-rust
config_foreach _enable_redir ss_redir
OMR_TRACKER_STATUS_MSG="Answer to ping and to API check"
mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@ -278,6 +291,8 @@ _check_backup() {
EOF
config_load shadowsocks-libev
config_foreach _disable_redir ss_redir
config_load shadowsocks-rust
config_foreach _disable_redir ss_redir
OMR_TRACKER_STATUS_MSG="No answer to ping and to API check"
mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@ -307,7 +322,11 @@ _check_backup() {
# config_foreach _enable_redir ss_redir
#fi
uci -q commit shadowsocks-libev
[ "$changes" = "1" ] && /etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
uci -q commit shadowsocks-rust
[ "$changes" = "1" ] && {
/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
}
[ "$server_ping" = true ] && break
}
}

4
shadowsocks-libev/files/shadowsocks-libev.init
View file

@ -369,6 +369,10 @@ rules_up() {
rules_down() {
rules_exist || return 0
enabled="0"
config_load shadowsocks-rust
config_foreach server_state server
[ "$enabled" = "1" ] && return
logger -t "Shadowsocks" "Rules DOWN"
local bin="$ss_bindir/ss-rules"
[ -x "$bin" ] && {

4
shadowsocks-rust/files/shadowsocks-rust.init
View file

@ -364,6 +364,10 @@ rules_up() {
rules_down() {
rules_exist || return 0
enabled="0"
config_load shadowsocks-libev
config_foreach server_state server
[ "$enabled" = "1" ] && return
logger -t "Shadowsocks-rust" "Rules DOWN"
local bin="$ss_bindir/ssr-rules"
[ -x "$bin" ] && {