From cce8d44f914958a8b73d5e39b4c4965430224585 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 20 Aug 2024 23:35:43 +0300 Subject: [PATCH] Move to hestiaip --- bin/v-update-sys-ip | 2 +- install/hst-install-debian.sh | 2 +- install/hst-install-rhel.sh | 2 +- install/hst-install-ubuntu.sh | 2 +- package.json | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index 1f3ee00..5a723c2 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -171,7 +171,7 @@ if [ -e $HESTIA/conf/nopublickip ]; then ip="$(ls -t $HESTIA/data/ips/ | head -n1)" $BIN/v-change-sys-ip-nat "$ip" "$ip" else - pub_ipv4="$(curl -fsLm5 --retry 2 --ipv4 https://ip.hestiacp.com/)" + pub_ipv4="$(curl -fsLm5 --retry 2 --ipv4 -H "Simple-Hestiacp: yes" https://hestiaip.brepo.ru/)" if [ ! -e "$HESTIA/data/ips/$pub_ipv4" ]; then if [ -z "$(grep -R "$pub_ipv4" $HESTIA/data/ips/)" ]; then ip="$(ls -t $HESTIA/data/ips/ | head -n1)" diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh index ca7362e..131aead 100755 --- a/install/hst-install-debian.sh +++ b/install/hst-install-debian.sh @@ -2089,7 +2089,7 @@ if [ "$iptables" = 'yes' ]; then fi # Get public IP -pub_ipv4="$(curl -fsLm5 --retry 2 --ipv4 https://ip.hestiacp.com/)" +pub_ipv4="$(curl -fsLm5 --retry 2 --ipv4 -H "Simple-Hestiacp: yes" https://hestiaip.brepo.ru/)" if [ -n "$pub_ipv4" ] && [ "$pub_ipv4" != "$ip" ]; then if [ -e /etc/rc.local ]; then sed -i '/exit 0/d' /etc/rc.local diff --git a/install/hst-install-rhel.sh b/install/hst-install-rhel.sh index 3430563..7f4e323 100755 --- a/install/hst-install-rhel.sh +++ b/install/hst-install-rhel.sh @@ -1892,7 +1892,7 @@ fi # Get public IP pub_ip=$ip if [ "$nopublicip" = 'no' ]; then - pub_ip=$(curl --ipv4 -s https://ip.hestiacp.com/) + pub_ip=$(curl -fsLm5 --retry 2 --ipv4 -H "Simple-Hestiacp: yes" https://hestiaip.brepo.ru/) if [ -n "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then $HESTIA/bin/v-change-sys-ip-nat $ip $pub_ip > /dev/null 2>&1 diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh index 3382981..f48564e 100755 --- a/install/hst-install-ubuntu.sh +++ b/install/hst-install-ubuntu.sh @@ -2064,7 +2064,7 @@ if [ "$iptables" = 'yes' ]; then fi # Get public IP -pub_ipv4="$(curl -fsLm5 --retry 2 --ipv4 https://ip.hestiacp.com/)" +pub_ipv4="$(curl -fsLm5 --retry 2 --ipv4 -H "Simple-Hestiacp: yes" https://hestiaip.brepo.ru/)" if [ -n "$pub_ipv4" ] && [ "$pub_ipv4" != "$ip" ]; then if [ -e /etc/rc.local ]; then sed -i '/exit 0/d' /etc/rc.local diff --git a/package.json b/package.json index 1616119..9caef5f 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "docs:dev": "vitepress dev docs", "docs:build": "vitepress build docs", "docs:serve": "vitepress serve docs", + "docs:preview": "vitepress preview docs --port=5173 --host=127.0.0.1", "build": "node build.js", "lint": "prettier --cache --check . && eslint --cache . && stylelint web/css/src/**/*.css && markdownlint-cli2 *.md docs/**/*.md", "lint-staged": "lint-staged",