midoks
/
mdserver-web
mirror of https://github.com/midoks/mdserver-web
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: error when no ipv4/6

Browse Source
pull/109/head
xcsoft 3 years ago committed by GitHub
parent 912ef7293d
commit cabcc611da
1 changed files with 7 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      scripts/init.d/mw.tpl

24
scripts/init.d/mw.tpl
Unescape View File

@ -187,24 +187,14 @@ case "$1" in
fi fi
if [ "$address" = "" ];then if [ "$address" = "" ];then
v4_available=true v4=$(python3 /www/server/mdserver-web/tools.py getServerIp 4)
v6_available=true v6=$(python3 /www/server/mdserver-web/tools.py getServerIp 6)
{
v4=$(curl -4 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text) if [ $v4 != "" ] && [ $v6 != "" ]; then
} || { address="MW-Panel-Url-Ipv4: http://$v4:$port$auth_path \nMW-Panel-Url-Ipv6: http://[$v6]:$port$auth_path"
v4_available=false elif [ $v4 != "" ]; then
}
{
v6=$(curl -6 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text)
} || {
v6_available=false
}
if [ $v4_available = true ] && [ $v6_available = true ]; then
address="MW-Panel-Url: http://$v4:$port$auth_path \nMW-Panel-Url: http://[$v6]:$port$auth_path"
elif [ $v4_available = true ]; then
address="MW-Panel-Url: http://$v4:$port$auth_path" address="MW-Panel-Url: http://$v4:$port$auth_path"
elif [ $v6_available = true ]; then elif [ $v6 != "" ]; then
address="MW-Panel-Url: http://[$v6]:$port$auth_path" address="MW-Panel-Url: http://[$v6]:$port$auth_path"
else else
address="No v4 or v6 available" address="No v4 or v6 available"

Write Preview
Loading…
Cancel
Save