github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Debian/Ubuntu. MAIL_USER is now defined localy

Browse source
This commit is contained in:
Serghey Rodin 2014-05-05 17:10:25 +03:00
commit f50c068ecf
5 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/v-add-mail-account-autoreply
View file

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

7
bin/v-add-mail-account-fwd-only
View file

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

7
bin/v-add-mail-domain
View file

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

7
bin/v-add-mail-domain-dkim
View file

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

7
func/main.sh
View file

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