|
@@ -249,7 +249,10 @@ check_config() {
|
|
|
local existing_webBasePath=$(echo "$info" | grep -Eo 'webBasePath: .+' | awk '{print $2}')
|
|
|
local existing_port=$(echo "$info" | grep -Eo 'port: .+' | awk '{print $2}')
|
|
|
local existing_cert=$(/usr/local/x-ui/x-ui setting -getCert true | grep -Eo 'cert: .+' | awk '{print $2}')
|
|
|
- local server_ip=$(curl -s https://api.ipify.org)
|
|
|
+ local server_ip=$(curl -s --max-time 3 https://api.ipify.org)
|
|
|
+ if [ -z "$server_ip" ]; then
|
|
|
+ server_ip=$(curl -s --max-time 3 https://4.ident.me)
|
|
|
+ fi
|
|
|
|
|
|
if [[ -n "$existing_cert" ]]; then
|
|
|
local domain=$(basename "$(dirname "$existing_cert")")
|
|
@@ -1630,7 +1633,10 @@ remove_iplimit() {
|
|
|
}
|
|
|
|
|
|
SSH_port_forwarding() {
|
|
|
- local server_ip=$(curl -s https://api.ipify.org)
|
|
|
+ local server_ip=$(curl -s --max-time 3 https://api.ipify.org)
|
|
|
+ if [ -z "$server_ip" ]; then
|
|
|
+ server_ip=$(curl -s --max-time 3 https://4.ident.me)
|
|
|
+ fi
|
|
|
local existing_webBasePath=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'webBasePath: .+' | awk '{print $2}')
|
|
|
local existing_port=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'port: .+' | awk '{print $2}')
|
|
|
local existing_listenIP=$(/usr/local/x-ui/x-ui setting -getListen true | grep -Eo 'listenIP: .+' | awk '{print $2}')
|