From ec9ecdf96ca0b5c36ccc0a82d3f420d1601aae26 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Tue, 9 Sep 2014 23:45:00 +0400 Subject: [PATCH 1/9] =?UTF-8?q?=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 --- bin/v-add-mail-account-alias | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index 9447bfb9..d1d12a4c 100755 --- a/bin/v-add-mail-account-alias +++ b/bin/v-add-mail-account-alias @@ -45,7 +45,7 @@ is_mail_new "$malias" # Adding exim alias if [[ "$MAIL_SYSTEM" =~ exim ]]; then - str="$malias@$domain:$account@$domain" + str="$malias@$domain_idn:$account@$domain_idn" echo "$str" >> $HOMEDIR/$user/conf/mail/$domain/aliases fi From a9d18d249ead95a50bc899a1d80b3537fc1ca9d6 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Tue, 9 Sep 2014 23:53:51 +0400 Subject: [PATCH 2/9] =?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 1c8c4f06..12f5705d 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 From 5d3bdc627c3b217bf4937ccac433c8cf3f6e0738 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:40:40 +0400 Subject: [PATCH 3/9] =?UTF-8?q?=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 --- bin/v-add-mail-account-forward | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index ba1f3de1..5b2720a1 100755 --- a/bin/v-add-mail-account-forward +++ b/bin/v-add-mail-account-forward @@ -57,8 +57,8 @@ fi # Adding forward to exim if [[ "$MAIL_SYSTEM" =~ exim ]]; then - sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases - echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases + sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases + echo "$account@$domain_idn:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases fi From e058a35113ff61ead75e2ffe33ee4c2e33f38e00 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:42:37 +0400 Subject: [PATCH 4/9] =?UTF-8?q?=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 --- bin/v-add-mail-domain-catchall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index e6f2f1ae..c49bacc9 100755 --- a/bin/v-add-mail-domain-catchall +++ b/bin/v-add-mail-domain-catchall @@ -42,8 +42,8 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$CATCHALL' # Adding catchall alias if [[ "$MAIL_SYSTEM" =~ exim ]]; then - sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases - echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases + sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases + echo "*@$domain_idn:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases fi From f713cf058351a554448a2a294f3f8e12a51f1cce Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:43:58 +0400 Subject: [PATCH 5/9] =?UTF-8?q?=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 --- bin/v-change-mail-domain-catchall | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index fa3c2a1c..7428d552 100755 --- a/bin/v-change-mail-domain-catchall +++ b/bin/v-change-mail-domain-catchall @@ -41,8 +41,8 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain" # Change cathcall alias if [[ "$MAIL_SYSTEM" =~ exim ]]; then - sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases - echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases + sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases + echo "*@$domain_idn:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases fi From 591c4c4ea10a15053fd5a7dd6cc03a0809c6e2e3 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:47:13 +0400 Subject: [PATCH 6/9] =?UTF-8?q?=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 --- bin/v-delete-mail-account | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index e94cae4d..7f11911d 100755 --- a/bin/v-delete-mail-account +++ b/bin/v-delete-mail-account @@ -44,11 +44,11 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account" if [[ "$MAIL_SYSTEM" =~ exim ]]; then aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS') for al in ${aliases//,/ }; do - sed -i "/^$al@$domain:$account/d" \ + sed -i "/^$al@$domain_idn:$account/d" \ $HOMEDIR/$user/conf/mail/$domain/aliases done - sed -i "/^$account@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases + sed -i "/^$account@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd rm -rf $HOMEDIR/$user/mail/$domain/$account fi From e1e49c23a3cae3672f759776fbec86423534c860 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:48:03 +0400 Subject: [PATCH 7/9] =?UTF-8?q?=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 --- bin/v-delete-mail-account-alias | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index de7310d7..c8d1da44 100755 --- a/bin/v-delete-mail-account-alias +++ b/bin/v-delete-mail-account-alias @@ -49,7 +49,7 @@ fi #----------------------------------------------------------# if [[ "$MAIL_SYSTEM" =~ exim ]]; then - sed -i "/^$malias@$domain:$account/d" \ + sed -i "/^$malias@$domain_idn:$account/d" \ $HOMEDIR/$user/conf/mail/$domain/aliases fi From 30eeb63a9133672c582b65efdefefe8e58435a60 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:48:59 +0400 Subject: [PATCH 8/9] =?UTF-8?q?=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 --- bin/v-delete-mail-account-forward | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index 4eb31e6c..4562789c 100755 --- a/bin/v-delete-mail-account-forward +++ b/bin/v-delete-mail-account-forward @@ -57,8 +57,8 @@ fwd=$(echo "$fwd" |\ # Deleting exim forward if [[ "$MAIL_SYSTEM" =~ exim ]]; then - sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases - echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases + sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases + echo "$account@$domain_idn:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases fi From ebf2df26abc41b40e2b872af07e41ddd6bfd0c69 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Wed, 10 Sep 2014 00:49:51 +0400 Subject: [PATCH 9/9] =?UTF-8?q?=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 --- bin/v-delete-mail-domain-catchall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index 42a6ce66..3fa0639f 100755 --- a/bin/v-delete-mail-domain-catchall +++ b/bin/v-delete-mail-domain-catchall @@ -41,7 +41,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$CATCHALL' # Delete cathcall alias if [[ "$MAIL_SYSTEM" =~ exim ]]; then - sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases + sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases fi