github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 10:37:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #212 from kinolaev/patch-1

Browse source 
punycode aliases
This commit is contained in:
Serghey Rodin 2014-11-13 23:31:11 +02:00
commit c7f815c68d
9 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
func/rebuild.sh
View file

@ -489,7 +489,7 @@ rebuild_mail_domain_conf() {
# Adding catchall email
dom_aliases=$HOMEDIR/$user/conf/mail/$domain/aliases
if [ ! -z "$CATCHALL" ]; then
echo "*@$domain:$CATCHALL" >> $dom_aliases
echo "*@$domain_idn:$CATCHALL" >> $dom_aliases
fi
fi
@ -515,10 +515,10 @@ rebuild_mail_domain_conf() {
str="$account:$MD5:$user:mail::$HOMEDIR/$user:$QUOTA"
echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
for malias in ${ALIAS//,/ }; do
echo "$malias@$domain:$account@$domain" >> $dom_aliases
echo "$malias@$domain_idn:$account@$domain_idn" >> $dom_aliases
done
if [ ! -z "$FWD" ]; then
echo "$account@$domain:$FWD" >> $dom_aliases
echo "$account@$domain_idn:$FWD" >> $dom_aliases
fi
if [ "$FWD_ONLY" = 'yes' ]; then
echo "$account" >> $HOMEDIR/$user/conf/mail/$domain/fwd_only