Merge branch 'main' into fix/1913-ssl-rainloop

Author: jaapmarcus

CHANGELOG.md

@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue where phpmyadmin did not update when Postgresql was available.
 - Webmail clients set to rainloop where not able to create a SSL certificate via LE #1913
 - Fixed an issue where plugin-hestia-change-pasword did not change the port on v-change-sys-port (Rainloop) #1895
+- Fixed an issue where HELO message was not set / error was created on NAT IP
 
 ## [1.4.2] - Service release
 

bin/v-change-user-php-cli

@@ -3,7 +3,7 @@
 # options: USER VERSION
 # labels: hestia
 #
-# example: v-change-user-php-cli user php7.4
+# example: v-change-user-php-cli user 7.4
 #
 # add line to .bash_aliases to set default php command line
 # version when multi-php is enabled.

install/hst-install-debian.sh

@@ -1757,7 +1757,7 @@ fi
 
 if [ "$exim" = 'yes' ]; then
 # Set HELO for IP as it didn't set during v-change-sys-hostname
-$HESTIA/bin/v-change-sys-ip-helo $pub_ip $servername
+$HESTIA/bin/v-change-sys-ip-helo $ip $servername
 fi
 
 # Configuring libapache2-mod-remoteip

install/hst-install-ubuntu.sh

@@ -1789,7 +1789,7 @@ fi
 
 if [ "$exim" = 'yes' ]; then
 # Set HELO for IP as it didn't set during v-change-sys-hostname
-$HESTIA/bin/v-change-sys-ip-helo $pub_ip $servername
+$HESTIA/bin/v-change-sys-ip-helo $ip $servername
 fi
 
 # Configuring libapache2-mod-remoteip