From db56def949d2185a6cb1afdeb3fb3580473b7748 Mon Sep 17 00:00:00 2001
From: kinolaev <kinolaev@gmail.com>
Date: Tue, 9 Sep 2014 23:51:14 +0400
Subject: [PATCH] =?UTF-8?q?=D0=90=D0=BB=D0=B8=D0=B0=D1=81=D1=8B=20=D0=BA?=
 =?UTF-8?q?=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D0=BA?=
 =?UTF-8?q?=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 e0f90a647..6ac4d2879 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -485,7 +485,7 @@ rebuild_mail_domain_conf() {
 
     dom_aliases=$HOMEDIR/$user/conf/mail/$domain/aliases
     if [ ! -z "$CATCHALL" ]; then
-        echo "*@$domain:$CATCHALL" >> $dom_aliases
+        echo "*@$domain_idn:$CATCHALL" >> $dom_aliases
     fi
 
     # Rebuild domain accounts
@@ -510,10 +510,10 @@ rebuild_mail_domain_conf() {
         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