idn fix for mail domains

This commit is contained in:
Serghey Rodin 2013-03-31 17:17:53 +03:00
commit 60f812d41c
3 changed files with 170 additions and 30 deletions

View file

@ -51,12 +51,12 @@ touch $HOMEDIR/$user/conf/mail/$domain/passwd
chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain
chmod 770 $HOMEDIR/$user/conf/mail/$domain
chmod 660 $HOMEDIR/$user/conf/mail/$domain/*
mkdir $HOMEDIR/$user/mail/$domain
chown $user:mail $HOMEDIR/$user/mail/$domain
chmod 770 $HOMEDIR/$user/mail/$domain
mkdir $HOMEDIR/$user/mail/$domain_idn
chown $user:mail $HOMEDIR/$user/mail/$domain_idn
chmod 770 $HOMEDIR/$user/mail/$domain_idn
# Adding symlink
ln -s $HOMEDIR/$user/conf/mail/$domain /etc/exim/domains/
ln -s $HOMEDIR/$user/conf/mail/$domain /etc/exim/domains/$domain_idn
# Adding antispam protection
if [ "$antispam" = 'yes' ]; then

View file

@ -13,6 +13,7 @@
# Argument defenition
user=$1
domain=$(idn -t --quiet -u "$2" )
domain_idn=$(idn -t --quiet -a "$domain")
# Includes
source $VESTA/conf/vesta.conf
@ -41,9 +42,9 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
get_domain_values 'mail'
accounts=$(wc -l $USER_DATA/mail/$domain.conf|cut -f 1 -d ' ')
rm -f /etc/exim/domains/$domain
rm -f /etc/exim/domains/$domain_idn
rm -rf $HOMEDIR/$user/conf/mail/$domain
rm -rf $HOMEDIR/$user/mail/$domain
rm -rf $HOMEDIR/$user/mail/$domain_idn
#----------------------------------------------------------#