mptcp/openmptcprouter-vps
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps.git synced 2025-02-14 12:21:56 +00:00
Code Issues Releases Wiki Activity

Update and fix https://github.com/Ysurac/openmptcprouter-vps/issues/18

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-03-18 10:31:47 +00:00
parent 1e1270de67
commit 54b5379621
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debian9-x86_64.sh
View file

@ -6,20 +6,20 @@ NBCPU=${NBCPU:-$(grep -c '^processor' /proc/cpuinfo | tr -d "\n")}
OBFS=${OBFS:-yes}
V2RAY=${V2RAY:-yes}
OMR_ADMIN=${OMR_ADMIN:-yes}
OMR_ADMIN_PASS=${OMR_ADMIN_PASS:-$(od -vN "32" -An -tx1 /dev/urandom | tr '[:lower:]' '[:upper:]' | tr -d " \n")}
OMR_ADMIN_PASS=${OMR_ADMIN_PASS:-$(od -vN "32" -An -tx1 /dev/urandom | tr '[:lower:]' '[:upper:]' | tr -d " \n")}
MLVPN=${MLVPN:-yes}
MLVPN_PASS=${MLVPN_PASS:-$(head -c 32 /dev/urandom | base64 -w0)}
OPENVPN=${OPENVPN:-yes}
INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -Po '(?<=dev )(\S+)' | tr -d "\n")}
INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev )(\S+)' | tr -d "\n")}
KERNEL_VERSION="4.14.105"
KERNEL_RELEASE="${KERNEL_VERSION}-mptcp-310b683"
GLORYTUN_UDP_VERSION="0dddca3b61130ae2195e7f4f0fb7ebe1292759e1"
GLORYTUN_UDP_VERSION="871f48809705bda0d889992150c3c89080d5bfd5"
MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
OBFS_VERSION="5cbfdcc28cdc912852cc3c99e3c7f5603d337805"
OMR_ADMIN_VERSION="9ebf8177817faa5c0680fd86830150c63ff1a0de"
V2RAY_VERSION="v1.1.0"
SHADOWSOCKS_VERSION="3.2.5"
OMR_VERSION="0.97"
OMR_VERSION="0.98"
set -e
umask 0022

5
omr-service
View file

@ -37,7 +37,8 @@ _ping() {
-W 5 \
-c 1 \
-q
) && echo "$ret" | grep -sq "0% packet loss" && {
)
[ -n "$ret" ] && echo "$ret" | grep -sq "0% packet loss" && {
return
}
false
@ -104,7 +105,7 @@ $allip_mlvpn"
}
fi
fi
result="$(curl -Isk https://127.0.0.1:65500/status | head -n 1 | grep 401)"
result="$(curl -Isk -m 30 https://127.0.0.1:65500/status | head -n 1 | grep 401)"
if [ "$result" = "" ]; then
logger -t "OMR-Service" "Restart OMR Admin"
systemctl -q restart omr-admin