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

sync (#494)

Browse source
This commit is contained in:
suyuan 2024-05-28 19:45:19 +08:00 • committed by GitHub
commit 80ebe65413
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,6 +182,11 @@ _check_master() {
set shadowsocks-libev.sss${count}.disabled=0 set shadowsocks-libev.sss${count}.disabled=0
EOF EOF
fi fi
if [ -z "$(uci -q get openvpn.omr.remote | grep $ip)" ]; then
uci -q batch <<-EOF >/dev/null
add_list openvpn.omr.remote=$ip
EOF
fi
if [ "$count" -eq "0" ]; then if [ "$count" -eq "0" ]; then
config_load openmptcprouter config_load openmptcprouter
config_foreach _disable_current server config_foreach _disable_current server
@ -260,6 +265,13 @@ _check_master() {
config_foreach _get_server_name server $ip config_foreach _get_server_name server $ip
[ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-rust" [ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-rust"
if [ -n "$(uci -q get openvpn.omr.remote | grep $ip)" ]; then
uci -q batch <<-EOF >/dev/null
del_list openvpn.omr.remote=$ip
EOF
fi
OMR_TRACKER_STATUS_MSG="No answer to ping and to API check" OMR_TRACKER_STATUS_MSG="No answer to ping and to API check"
mail_alert="$(uci -q get omr-tracker.server.mail_alert)" mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)" #[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@ -297,11 +309,14 @@ _check_master() {
fi fi
[ -n "$(uci changes shadowsocks-libev)" ] && changes="1" [ -n "$(uci changes shadowsocks-libev)" ] && changes="1"
[ -n "$(uci changes shadowsocks-rust)" ] && changes="1" [ -n "$(uci changes shadowsocks-rust)" ] && changes="1"
[ -n "$(uci changes openvpn)" ] && changes="1"
uci -q commit shadowsocks-libev uci -q commit shadowsocks-libev
uci -q commit shadowsocks-rust uci -q commit shadowsocks-rust
uci -q commit openvpn
[ "$changes" = "1" ] && { [ "$changes" = "1" ] && {
/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null /etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null /etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
/etc/init.d/openvpn restart omr >/dev/null 2>/dev/null
} }
break break
} }

2
openmptcprouter-full/Makefile
View file

@ -76,7 +76,7 @@ MY_DEPENDS := \
!(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-option !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-wwan !(TARGET_mvebu||TARGET_ipq40xx):usb-modeswitch !TARGET_mvebu:uqmi \ !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-option !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-wwan !(TARGET_mvebu||TARGET_ipq40xx):usb-modeswitch !TARGET_mvebu:uqmi \
!TARGET_mvebu:umbim !TARGET_mvebu:kmod-mii !TARGET_mvebu:kmod-usb-net !TARGET_mvebu:kmod-usb-wdm !TARGET_mvebu:kmod-usb-net-qmi-wwan !TARGET_mvebu:kmod-usb-net-cdc-mbim !TARGET_mvebu:umbim \ !TARGET_mvebu:umbim !TARGET_mvebu:kmod-mii !TARGET_mvebu:kmod-usb-net !TARGET_mvebu:kmod-usb-wdm !TARGET_mvebu:kmod-usb-net-qmi-wwan !TARGET_mvebu:kmod-usb-net-cdc-mbim !TARGET_mvebu:umbim \
!(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-huawei-cdc-ncm !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-rndis !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-cdc-ether !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-ipheth !(TARGET_mvebu||TARGET_ipq40xx):usbmuxd !(TARGET_mvebu||TARGET_ipq40xx):libusbmuxd \ !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-huawei-cdc-ncm !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-rndis !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-cdc-ether !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-ipheth !(TARGET_mvebu||TARGET_ipq40xx):usbmuxd !(TARGET_mvebu||TARGET_ipq40xx):libusbmuxd \
!TARGET_mvebu:luci-proto-qmi wpad-openssl !(TARGET_ipq40xx||TARGET_x86_64):kmod-mt7601u TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \ !TARGET_mvebu:luci-proto-qmi wpad-openssl libopenssl-legacy !(TARGET_ipq40xx||TARGET_x86_64):kmod-mt7601u TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \
!TARGET_mvebu:luci-app-mlvpn !TARGET_mvebu:mlvpn 464xlat kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss iptraf-ng \ !TARGET_mvebu:luci-app-mlvpn !TARGET_mvebu:mlvpn 464xlat kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss iptraf-ng \
luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim !TARGET_x86_64:kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \ luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim !TARGET_x86_64:kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \
hwinfo (TARGET_x86||TARGET_x86_64):dmidecode kmod-bonding luci-proto-bonding luci-app-sysupgrade \ hwinfo (TARGET_x86||TARGET_x86_64):dmidecode kmod-bonding luci-proto-bonding luci-app-sysupgrade \

9
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -560,9 +560,10 @@ _get_vps_config() {
/etc/init.d/xray restart /etc/init.d/xray restart
fi fi
fi fi
if [ -n "$(uci -q get openvpn.omr)" ] && [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ "$(uci -q get openvpn.omr.remote)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then if [ -n "$(uci -q get openvpn.omr)" ] && [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ -z "$(uci -q get openvpn.omr.remote | grep $vpsip)" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openvpn.omr.remote="$vpsip" delete openvpn.omr.remote
add_list openvpn.omr.remote="$vpsip"
commit openvpn commit openvpn
EOF EOF
if [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then if [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then
@ -1822,8 +1823,8 @@ _set_config_from_vps() {
set openvpn.omr.client=1 set openvpn.omr.client=1
set openvpn.omr.allow_recursive_routing=1 set openvpn.omr.allow_recursive_routing=1
EOF EOF
if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ]; then if [ -z "$(uci -q get openvpn.omr.remote | grep $vpsip)" ]; then
uci -q set openvpn.omr.remote="$vpsip" uci -q add_list openvpn.omr.remote="$vpsip"
fi fi
uci -q commit openvpn uci -q commit openvpn
logger -t "OMR-VPS" "OpenVPN restart..." logger -t "OMR-VPS" "OpenVPN restart..."