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

Display new omr-admin key even after an update

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2018-11-29 08:10:52 +00:00
parent 5e46ec606d
commit 1869f2da7d
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
debian9-x86_64.sh
View file

@ -11,7 +11,7 @@ MLVPN_PASS=${MLVPN_PASS:-$(head -c 32 /dev/urandom | base64 -w0)}
OPENVPN=${OPENVPN:-no} OPENVPN=${OPENVPN:-no}
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 -Po '(?<=dev )(\S+)' | tr -d "\n")}
KERNEL_VERSION="4.14.79-mptcp-6ece8f4" KERNEL_VERSION="4.14.79-mptcp-6ece8f4"
OMR_VERSION="0.65" OMR_VERSION="0.66"
set -e set -e
umask 0022 umask 0022
@ -134,6 +134,7 @@ if [ "$OMR_ADMIN" = "yes" ]; then
unzip -q -o openmptcprouter-vps-admin.zip unzip -q -o openmptcprouter-vps-admin.zip
if [ -f /usr/local/bin/omr-admin.py ]; then if [ -f /usr/local/bin/omr-admin.py ]; then
cp /tmp/openmptcprouter-vps-admin-master/omr-admin.py /usr/local/bin/ cp /tmp/openmptcprouter-vps-admin-master/omr-admin.py /usr/local/bin/
OMR_ADMIN_PASS=$(grep -Po '"pass":.*?[^\\]"' /etc/openmptcprouter-vps-admin/omr-admin-config.json | awk -F':' '{print $2}' | sed 's/"//g')
else else
sed -i "s:MySecretKey:$OMR_ADMIN_PASS:g" /tmp/openmptcprouter-vps-admin-master/omr-admin-config.json sed -i "s:MySecretKey:$OMR_ADMIN_PASS:g" /tmp/openmptcprouter-vps-admin-master/omr-admin-config.json
cp /tmp/openmptcprouter-vps-admin-master/omr-admin-config.json /etc/openmptcprouter-vps-admin/ cp /tmp/openmptcprouter-vps-admin-master/omr-admin-config.json /etc/openmptcprouter-vps-admin/
@ -467,14 +468,6 @@ else
systemctl -q start glorytun-udp@tun0 systemctl -q start glorytun-udp@tun0
systemctl -q restart omr systemctl -q restart omr
echo 'done' echo 'done'
echo 'Restarting shadowsocks...'
systemctl -q restart shadowsocks-libev-server@config
if [ $NBCPU -gt 1 ]; then
for i in $NBCPU; do
systemctl restart shadowsocks-libev-server@config$i
done
fi
echo 'done'
if [ "$OPENVPN" = "yes" ]; then if [ "$OPENVPN" = "yes" ]; then
echo 'Restarting OpenVPN' echo 'Restarting OpenVPN'
systemctl -q restart openvpn@tun0 systemctl -q restart openvpn@tun0
@ -484,6 +477,17 @@ else
echo 'Restarting OpenMPTCProuter VPS admin' echo 'Restarting OpenMPTCProuter VPS admin'
systemctl -q restart omr-admin systemctl -q restart omr-admin
echo 'done' echo 'done'
if ! grep -q 'VPS Admin key' /root/openmptcprouter_config.txt ; then
cat >> /root/openmptcprouter_config.txt <<-EOF
Your OpenMPTCProuter VPS Admin key: $OMR_ADMIN_PASS
EOF
echo '===================================================================================='
echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
echo 'OpenMPTCProuter VPS admin key (you need OpenMPTCProuter >= 0.42):'
echo $OMR_ADMIN_PASS
echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
echo '===================================================================================='
fi
fi fi
echo 'Restarting shorewall...' echo 'Restarting shorewall...'
systemctl -q restart shorewall systemctl -q restart shorewall
@ -492,4 +496,12 @@ else
echo 'Apply latest sysctl...' echo 'Apply latest sysctl...'
sysctl -p /etc/sysctl.d/90-shadowsocks.conf > /dev/null 2>&1 sysctl -p /etc/sysctl.d/90-shadowsocks.conf > /dev/null 2>&1
echo 'done' echo 'done'
echo 'Restarting shadowsocks...'
systemctl -q restart shadowsocks-libev-server@config
if [ $NBCPU -gt 1 ]; then
for i in $NBCPU; do
systemctl restart shadowsocks-libev-server@config$i
done
fi
echo 'done'
fi fi