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

replaced static definition for mail server

Browse source
This commit is contained in:
Serghey Rodin 2013-06-24 16:58:45 +03:00
commit fbb54a87fe
5 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ chown $user:mail $HOMEDIR/$user/mail/$domain_idn
chmod 770 $HOMEDIR/$user/mail/$domain_idn chmod 770 $HOMEDIR/$user/mail/$domain_idn
# Adding symlink # Adding symlink
ln -s $HOMEDIR/$user/conf/mail/$domain /etc/exim/domains/$domain_idn ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
# Adding antispam protection # Adding antispam protection
if [ "$antispam" = 'yes' ]; then if [ "$antispam" = 'yes' ]; then

2
bin/v-delete-mail-domain
View file

@ -42,7 +42,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
get_domain_values 'mail' get_domain_values 'mail'
accounts=$(wc -l $USER_DATA/mail/$domain.conf|cut -f 1 -d ' ') accounts=$(wc -l $USER_DATA/mail/$domain.conf|cut -f 1 -d ' ')
rm -f /etc/exim/domains/$domain_idn rm -f /etc/$MAIL_SYSTEM/domains/$domain_idn
rm -rf $HOMEDIR/$user/conf/mail/$domain rm -rf $HOMEDIR/$user/conf/mail/$domain
rm -rf $HOMEDIR/$user/mail/$domain_idn rm -rf $HOMEDIR/$user/mail/$domain_idn

2
bin/v-suspend-mail-domain
View file

@ -39,7 +39,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
#----------------------------------------------------------# #----------------------------------------------------------#
# Deleting symbolic link # Deleting symbolic link
rm -f /etc/exim/domains/$domain rm -f /etc/$MAIL_SYSTEM/domains/$domain
#----------------------------------------------------------# #----------------------------------------------------------#

2
bin/v-unsuspend-mail-domain
View file

@ -38,7 +38,7 @@ is_object_suspended 'mail' 'DOMAIN' "$domain"
#----------------------------------------------------------# #----------------------------------------------------------#
# Add symbolic link # Add symbolic link
ln -s $HOMEDIR/$user/conf/mail/$domain /etc/exim/domains/ ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/
#----------------------------------------------------------# #----------------------------------------------------------#

4
install/vst-install.sh
View file

@ -742,10 +742,6 @@ vst_ip=$(wget vestacp.com/what-is-my-ip/ -O - 2>/dev/null)
if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then if [ ! -z "$vst_ip" ] && [ "$vst_ip" != "$main_ip" ]; then
# Set NAT association # Set NAT association
$VESTA/bin/v-change-sys-ip-nat $main_ip $vst_ip $VESTA/bin/v-change-sys-ip-nat $main_ip $vst_ip
# Assign passive ip address
echo "pasv_address=$vst_ip" >> /etc/vsftpd/vsftpd.conf
service vsftpd restart
fi fi
if [ -z "$vst_ip" ]; then if [ -z "$vst_ip" ]; then
vst_ip=$main_ip vst_ip=$main_ip