From a9d18d249ead95a50bc899a1d80b3537fc1ca9d6 Mon Sep 17 00:00:00 2001
From: kinolaev <kinolaev@gmail.com>
Date: Tue, 9 Sep 2014 23:53:51 +0400
Subject: [PATCH] =?UTF-8?q?=20=D0=90=D0=BB=D0=B8=D0=B0=D1=81=D1=8B=20?=
 =?UTF-8?q?=D0=BA=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=D0=B8=D1=87=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Пересоздание алиасов кириллических доменов в punycode формате
---
 func/rebuild.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/func/rebuild.sh b/func/rebuild.sh
index 1c8c4f061..12f5705de 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -488,7 +488,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
 
@@ -514,10 +514,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