diff --git a/bin/v-make-separated-ip-for-email b/bin/v-make-separated-ip-for-email index 17a0d0ca..35799b26 100644 --- a/bin/v-make-separated-ip-for-email +++ b/bin/v-make-separated-ip-for-email @@ -1,4 +1,4 @@ -#!/bin/bash + #!/bin/bash # info: add new ip and makes email to be sent via that IP only for SMTP authenticated users # options: MAIL_HOSTNAME MAIL_IP @@ -45,7 +45,7 @@ is_domain_format_valid "$MAIL_HOSTNAME" is_ip_format_valid "$MAIL_IP" HOST_USER=$($VESTA/bin/v-search-domain-owner "$HOSTNAME") -if [ -z "$HOST_USER" ]; then +if [ -z "$HOST_USER" ]; then echo "Error: hostname $HOSTNAME is not created as web domain" exit 4 fi @@ -140,14 +140,18 @@ if [ "$check_grep" -eq 0 ]; then mv /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf.template-backup cp /usr/local/vesta/install/debian/12/exim/exim4.conf.template /etc/exim4/exim4.conf.template - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - if [ "$release" -lt 11 ]; then - sed -i "s|smtputf8_advertise_hosts|#smtputf8_advertise_hosts|g" /etc/exim4/exim4.conf.template - fi - if [ "$release" -lt 12 ]; then + eximversion=$(exim4 --version | grep '^Exim version ' | awk '{print $3}') + eximversioni="${eximversion%%[^0-9]+([0-9])}" + eximversionf="${eximversion##+([0-9])[^0-9]}" + if [ "$eximversioni" -eq 4 ] && [ "$eximversionf" -lt 96 ]; then + cp /usr/local/vesta/install/debian/12/exim/exim4.conf.template.without-srs /etc/exim4/exim4.conf.template sed -i "s|message_linelength_limit|#message_linelength_limit|g" /etc/exim4/exim4.conf.template fi + if [ "$eximversioni" -eq 4 ] && [ "$eximversionf" -lt 94 ]; then + sed -i "s|smtputf8_advertise_hosts|#smtputf8_advertise_hosts|g" /etc/exim4/exim4.conf.template + fi + sed -i "s|FIRSTIP|$HOST_IP|g" /etc/exim4/exim4.conf.template sed -i "s|SECONDIP|$MAIL_IP|g" /etc/exim4/exim4.conf.template sed -i "s|FIRSTHOST|$HOSTNAME|g" /etc/exim4/exim4.conf.template