Просмотр исходного кода

fix missing pub_ip during install

Serghey Rodin 9 лет назад
Родитель
Сommit
5c98639825
3 измененных файлов с 6 добавлено и 12 удалено
  1. 2 4
      install/vst-install-debian.sh
  2. 2 4
      install/vst-install-rhel.sh
  3. 2 4
      install/vst-install-ubuntu.sh

+ 2 - 4
install/vst-install-debian.sh

@@ -1132,12 +1132,10 @@ $VESTA/bin/v-update-sys-ip
 ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
 
 # Get public ip
-pub_ip=$(curl vestacp.com/what-is-my-ip/)
+pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
 if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
     $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip
-fi
-if [ -z "$pub_ip" ]; then
-    ip=$main_ip
+    ip=$pub_ip
 fi
 
 # Firewall configuration

+ 2 - 4
install/vst-install-rhel.sh

@@ -1202,12 +1202,10 @@ $VESTA/bin/v-update-sys-ip
 ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
 
 # Get public ip
-pub_ip=$(curl vestacp.com/what-is-my-ip/)
+pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
 if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
     $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip
-fi
-if [ -z "$pub_ip" ]; then
-    ip=$main_ip
+    ip=$pub_ip
 fi
 
 # Firewall configuration

+ 2 - 4
install/vst-install-ubuntu.sh

@@ -1121,12 +1121,10 @@ $VESTA/bin/v-update-sys-ip
 ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
 
 # Get public ip
-pub_ip=$(curl vestacp.com/what-is-my-ip/)
+pub_ip=$(curl -s vestacp.com/what-is-my-ip/)
 if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then
     $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip
-fi
-if [ -z "$pub_ip" ]; then
-    ip=$main_ip
+    ip=$pub_ip
 fi
 
 # Firewall configuration