Merge pull request hestiacp#321 from Lupul/Bugfix-0524

Bugfix 0524

Author: ScIT-Raphael

bin/v-add-letsencrypt-domain

@@ -67,7 +67,8 @@ check_args '2' "$#" 'USER DOMAIN [ALIASES] [MAIL]'
 is_format_valid 'user' 'domain' 'aliases'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
-if [ -z "$mail" ]; then
+if [[ -z "${mail// }" ]] || [ "$mail" = 'no' ]; then
+    mail=''
     is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
     is_object_valid 'web' 'DOMAIN' "$domain"
     is_object_unsuspended 'web' 'DOMAIN' "$domain"

bin/v-update-sys-ip

@@ -110,7 +110,7 @@ for ip in $ips; do
 done
 
 # Updating NAT
-pub_ip=$(curl --ipv4 -s https://www.hestiacp.com/what-is-my-ip/)
+pub_ip=$(curl --ipv4 -s https://ip.hestiacp.com/)
 if [ ! -e "$HESTIA/data/ips/$pub_ip" ]; then
     if [ -z "$(grep -R "$pub_ip" $HESTIA/data/ips/)" ]; then
         ip=$(ls -t $HESTIA/data/ips/ |head -n1)

install/deb/apache2/unassigned.conf

@@ -1,12 +1,12 @@
 <VirtualHost directIP:directPORT>
-  
+    ServerName directIP
     DocumentRoot /var/www/html/
     Alias /error/ /var/www/document_errors/
 
 </VirtualHost>
 
 <VirtualHost directIP:directSSLPORT>
-  
+    ServerName directIP
     DocumentRoot /var/www/html/
     Alias /error/ /var/www/document_errors/