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

Add more log

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-26 17:22:34 +01:00
parent 7706777514
commit b9d286ce94
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1344,6 +1344,7 @@ if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter
fi fi
if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
_log "Set firewall on server"
/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1 /etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1
run_fw_include() { run_fw_include() {

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

@ -1768,7 +1768,10 @@ _config_service() {
EOF EOF
config_foreach _set_ss_server server "method" "aes-256-gcm" config_foreach _set_ss_server server "method" "aes-256-gcm"
uci -q commit shadowsocks-libev uci -q commit shadowsocks-libev
[ "$method" != "aes-256-gcm" ] && /etc/init.d/shadowsocks-libev restart [ "$method" != "aes-256-gcm" ] && {
logger -t "OMR-VPS" "Shadowsocks restart"
/etc/init.d/shadowsocks-libev restart
}
fi fi
} }
fi fi
@ -1807,12 +1810,13 @@ _config_service() {
if [ "$(uci -q get openmptcprouter.settings.vpn)" != "openvpn" ] && [ "$(echo "$vps_config" | jsonfilter -q -e '@.client2client.enabled')" == "true" ]; then if [ "$(uci -q get openmptcprouter.settings.vpn)" != "openvpn" ] && [ "$(echo "$vps_config" | jsonfilter -q -e '@.client2client.enabled')" == "true" ]; then
_set_client2client _set_client2client
fi fi
[ "$error" = 0 ] && { if [ "$error" = 0 ]; then
#logger -t "OMR-VPS" "No errors" #logger -t "OMR-VPS" "No errors"
uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s") uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
[ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0 [ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0
else
} logger -t "OMR-VPS" "Setting server config error, try again"
fi
#[ "$error" != 0 ] && logger -t "OMR-VPS" "Error !" #[ "$error" != 0 ] && logger -t "OMR-VPS" "Error !"
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.admin_error=$error set openmptcprouter.${servername}.admin_error=$error
@ -1866,5 +1870,6 @@ start_service() {
service_triggers() { service_triggers() {
procd_add_reload_trigger openmptcprouter network shadowsocks-libev v2ray glorytun glorytun-udp mlspn openvpn dsvpn procd_add_reload_trigger openmptcprouter network shadowsocks-libev v2ray glorytun glorytun-udp mlspn openvpn dsvpn
procd_add_config_trigger "config.change" "firewall" /etc/init.d/openmptcprouter-vps set_vps_firewall procd_add_config_trigger "config.change" "firewall" /etc/init.d/openmptcprouter-vps set_vps_firewall
#procd_add_config_trigger "config.change" "network" /etc/init.d/openmptcprouter-vps set_gre_tunnel
#procd_add_reload_trigger openmptcprouter shadowsocks-libev network upnpd #procd_add_reload_trigger openmptcprouter shadowsocks-libev network upnpd
} }