Fix for Debian/Ubuntu. MAIL_USER is now defined localy

bin/v-add-mail-account-autoreply

@@ -22,6 +22,13 @@ source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/conf/vesta.conf
 
+# Define mail user
+if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+    MAIL_USER=Debian-exim
+else
+    MAIL_USER=exim
+fi
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-account-fwd-only

@@ -21,6 +21,13 @@ source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/conf/vesta.conf
 
+# Define mail user
+if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+    MAIL_USER=Debian-exim
+else
+    MAIL_USER=exim
+fi
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-domain

@@ -25,6 +25,13 @@ source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/conf/vesta.conf
 
+# Define mail user
+if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+    MAIL_USER=Debian-exim
+else
+    MAIL_USER=exim
+fi
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #

bin/v-add-mail-domain-dkim

@@ -21,6 +21,13 @@ source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/conf/vesta.conf
 
+# Define mail user
+if [ "$MAIL_SYSTEM" = 'exim4' ]; then
+    MAIL_USER=Debian-exim
+else
+    MAIL_USER=exim
+fi
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #

func/main.sh

@@ -27,13 +27,6 @@ WEBTPL=$VESTA/data/templates/web
 DNSTPL=$VESTA/data/templates/dns
 RRD=$VESTA/web/rrd
 
-if [ "$MAIL_SYSTEM" = 'exim4' ]; then
-    MAIL_USER=Debian-exim
-else
-    MAIL_USER=exim
-fi
-
-
 # Return codes
 OK=0
 E_ARGS=1