Fixes for exim and divecot work

2026-08-10 21:41:37 +03:00
parent b31dce3817
commit 5914f54e64
229 changed files with 104 additions and 17842 deletions
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@@ -122,7 +122,7 @@ if [ -n "$user_rate_limit" ]; then
 	sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 	echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits
 else
-	system=$(cat /etc/exim4/limit.conf)
+	system=$(cat /etc/exim/limit.conf)
 	sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 	echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits
 fi
--- a/bin/v-add-mail-account-autoreply
+++ b/bin/v-add-mail-account-autoreply
@@ -28,11 +28,8 @@ source $HESTIA/func/domain.sh
 source_conf "$HESTIA/conf/hestia.conf"

 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-	MAIL_USER=Debian-exim
-else
-	MAIL_USER=exim
-fi
+MAIL_USER=exim
+

 # Additional argument formatting
 format_domain
--- a/bin/v-add-mail-account-fwd-only
+++ b/bin/v-add-mail-account-fwd-only
@@ -27,11 +27,8 @@ source $HESTIA/func/domain.sh
 source_conf "$HESTIA/conf/hestia.conf"

 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-	MAIL_USER=Debian-exim
-else
-	MAIL_USER=exim
-fi
+MAIL_USER=exim
+

 # Additional argument formatting
 format_domain
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -35,11 +35,7 @@ source $HESTIA/func/syshealth.sh
 source_conf "$HESTIA/conf/hestia.conf"

 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-	MAIL_USER=Debian-exim
-else
-	MAIL_USER=exim
-fi
+MAIL_USER=exim

 # Additional argument formatting
 format_domain
--- a/bin/v-add-mail-domain-dkim
+++ b/bin/v-add-mail-domain-dkim
@@ -27,11 +27,8 @@ source $HESTIA/func/domain.sh
 source_conf "$HESTIA/conf/hestia.conf"

 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-	MAIL_USER=Debian-exim
-else
-	MAIL_USER=exim
-fi
+MAIL_USER=exim
+

 # Additional argument formatting
 format_domain
--- a/bin/v-add-mail-domain-smtp-relay
+++ b/bin/v-add-mail-domain-smtp-relay
@@ -48,7 +48,7 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#

-cat > /etc/exim4/domains/${domain}/smtp_relay.conf << EOL
+cat > /etc/exim/domains/${domain}/smtp_relay.conf << EOL
 host:$host
 port:$port
 user:$username
--- a/bin/v-add-sys-smtp-relay
+++ b/bin/v-add-sys-smtp-relay
@@ -46,7 +46,7 @@ change_sys_value 'SMTP_RELAY_HOST' "$host"
 change_sys_value 'SMTP_RELAY_PORT' "$port"
 change_sys_value 'SMTP_RELAY_USER' "$username"

-cat > /etc/exim4/smtp_relay.conf << EOL
+cat > /etc/exim/smtp_relay.conf << EOL
 host:$host
 port:$port
 user:$username
--- a/bin/v-change-domain-owner
+++ b/bin/v-change-domain-owner
@@ -229,7 +229,7 @@ if [ -n "$mail_data" ]; then
 		echo "  ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf
 		echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf

-		# Add domain SSL configuration to exim4
+		# Add domain SSL configuration to exim
 		# Cleanup symlinks
 		find /usr/local/hestia/ssl/mail -xtype l -delete

--- a/bin/v-change-mail-account-rate-limit
+++ b/bin/v-change-mail-account-rate-limit
@@ -66,7 +66,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 			sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 			echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits
 		else
-			system=$(cat /etc/exim4/limit.conf)
+			system=$(cat /etc/exim/limit.conf)
 			sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits
 			echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits
 		fi
--- a/bin/v-change-sys-service-config
+++ b/bin/v-change-sys-service-config
@@ -69,7 +69,7 @@ case $service in
 	httpd) dst='/etc/httpd/conf/httpd.conf' ;;
 	apache2) dst='/etc/apache2/apache2.conf' ;;
 	exim) dst='/etc/exim/exim.conf' ;;
-	exim4) dst='/etc/exim4/exim4.conf.template' ;;
+	exim4) dst='/etc/exim/exim.conf.template' ;;
 	vsftpd) dst=$(find /etc/vsftpd* -name 'vsftpd.conf') ;;
 	proftpd) dst=$(find /etc/proftpd* -name 'proftpd.conf') ;;
 	php)
--- a/bin/v-delete-mail-domain-smtp-relay
+++ b/bin/v-delete-mail-domain-smtp-relay
@@ -37,7 +37,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 #                       Action                             #
 #----------------------------------------------------------#

-rm -f /etc/exim4/domains/${domain}/smtp_relay.conf
+rm -f /etc/exim/domains/${domain}/smtp_relay.conf

 #----------------------------------------------------------#
 #                       Hestia                             #
--- a/bin/v-delete-sys-smtp-relay
+++ b/bin/v-delete-sys-smtp-relay
@@ -34,7 +34,7 @@ change_sys_value "SMTP_RELAY_HOST" ""
 change_sys_value "SMTP_RELAY_PORT" ""
 change_sys_value "SMTP_RELAY_USER" ""

-rm -f /etc/exim4/smtp_relay.conf
+rm -f /etc/exim/smtp_relay.conf

 #----------------------------------------------------------#
 #                       Hestia                             #
--- a/bin/v-list-sys-mail-status
+++ b/bin/v-list-sys-mail-status
@@ -39,14 +39,10 @@ echo -en "\n---------------------------------------------"
 echo -en "---------------------------------------------\n\n"

 # Displaying exim stats
-if [ -e "/var/log/exim4/mainlog" ]; then
-	eximstats /var/log/exim4/mainlog 2> /dev/null
-else
-	eximstats /var/log/exim/main.log 2> /dev/null
-fi
+eximstats /var/log/exim/main.log 2> /dev/null

 if [ $? -ne 0 ]; then
-	echo "[Exim4] No valid log lines read"
+	echo "[Exim] No valid log lines read"
 	exit 0
 fi

--- a/bin/v-rebuild-mail-domain
+++ b/bin/v-rebuild-mail-domain
@@ -32,11 +32,8 @@ source $HESTIA/func/syshealth.sh
 source_conf "$HESTIA/conf/hestia.conf"

 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-	export MAIL_USER="Debian-exim"
-else
-	export MAIL_USER="exim"
-fi
+export MAIL_USER="exim"
+

 #----------------------------------------------------------#
 #                    Verifications                         #
--- a/bin/v-rebuild-mail-domains
+++ b/bin/v-rebuild-mail-domains
@@ -30,11 +30,8 @@ source $HESTIA/func/syshealth.sh
 source_conf "$HESTIA/conf/hestia.conf"

 # Define mail user
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-	export MAIL_USER="Debian-exim"
-else
-	export MAIL_USER="exim"
-fi
+export MAIL_USER="exim"
+

 #----------------------------------------------------------#
 #                    Verifications                         #
--- a/bin/v-restart-service
+++ b/bin/v-restart-service
@@ -77,7 +77,7 @@ for service in $service_list; do
 	elif [ -z "$restart" -o "$restart" = "no" ] && [ \
 		"$service" = "nginx" -o \
 		"$service" = "httpd" -o \
-		"$service" = "exim4" -o \
+		"$service" = "exim" -o \
 		"$service" = "dovecot" -o \
 		"$service" = "bind9" -o \
 		"$service" = "named" -o \
--- a/bin/v-restore-user
+++ b/bin/v-restore-user
@@ -643,7 +643,7 @@ if [ "$mail" != 'no' ] && [ -n "$MAIL_SYSTEM" ]; then
 				mkdir /usr/local/hestia/ssl/mail
 			fi

-			# Add domain SSL configuration to exim4
+			# Add domain SSL configuration to exim
 			# Cleanup broken symlinks
 			find /usr/local/hestia/ssl/mail -xtype l -delete