From 781b6abf8a81edc8bf5d6bba5d8a1957cba8d425 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 16:30:43 +0300 Subject: [PATCH 01/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru --- install/ubuntu/exim4.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/exim4.conf.template b/install/ubuntu/exim4.conf.template index d33226c97..3909a599f 100644 --- a/install/ubuntu/exim4.conf.template +++ b/install/ubuntu/exim4.conf.template @@ -260,7 +260,7 @@ remote_smtp: driver = smtp #helo_data = $sender_address_domain dkim_domain = DKIM_DOMAIN - dkim_selector = mail + dkim_selector = vmail dkim_private_key = DKIM_PRIVATE_KEY dkim_canon = relaxed dkim_strict = 0 From 2812c98a9ca104b9a51dafefdf36434d83ea8db2 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 16:47:30 +0300 Subject: [PATCH 02/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru и увеличение длины ключа до 1024 --- bin/v-add-mail-domain | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 1051567db..43aaac7cd 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -18,7 +18,7 @@ domain_idn=$(idn -t --quiet -a "$domain") antispam=${3-yes} antivirus=${4-yes} dkim=${5-yes} -dkim_size=${6-512} +dkim_size=${6-1024} # Includes source $VESTA/func/main.sh @@ -79,7 +79,7 @@ if [ "$dkim" = 'yes' ]; then policy="\"t=y; o=~;\"" $BIN/v-add-dns-record $user $domain $record TXT "$policy" - record='mail._domainkey' + record='vmail._domainkey' selector="\"k=rsa\; p=$p\"" $BIN/v-add-dns-record $user $domain $record TXT "$selector" fi From 4b31d9e73822a4a7a81d73bc67c5ef7442884635 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 16:54:47 +0300 Subject: [PATCH 03/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru и исправление пользователя exim для debian-based дистрибутивов --- bin/v-add-mail-domain-dkim | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 8c4726c51..8c3b2143f 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -48,7 +48,13 @@ chmod 660 $USER_DATA/mail/$domain.* # Adding dkim to config cp $USER_DATA/mail/$domain.pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem -chown exim:mail $HOMEDIR/$user/conf/mail/$domain/dkim.pem +if [ "$MAIL_SYSTEM" = 'exim' ]; then + mail_user=exim +fi +if [ "$MAIL_SYSTEM" = 'exim4' ]; then + mail_user=Debian-exim +fi +chown $mail_user:mail $HOMEDIR/$user/conf/mail/$domain/dkim.pem chmod 660 $HOMEDIR/$user/conf/mail/$domain/dkim.pem # Checking dns domain @@ -60,7 +66,7 @@ if [ "$?" -eq 0 ]; then policy="\"t=y; o=~;\"" $BIN/v-add-dns-record $user $domain $record TXT "$policy" - record='mail._domainkey' + record='vmail._domainkey' selector="\"k=rsa\; p=$p\"" $BIN/v-add-dns-record $user $domain $record TXT "$selector" fi From d03ead45ca45a81874f459498500a6ed2b54d061 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 16:59:03 +0300 Subject: [PATCH 04/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru --- bin/v-list-mail-domain-dkim-dns | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-list-mail-domain-dkim-dns b/bin/v-list-mail-domain-dkim-dns index b3c8c4887..013121b9b 100755 --- a/bin/v-list-mail-domain-dkim-dns +++ b/bin/v-list-mail-domain-dkim-dns @@ -24,7 +24,7 @@ json_list_dkim_dns() { echo " \"TTL\": \"3600\"," echo " \"TXT\": \"'t=y; o=~;'\"" echo -e "\t}," - echo -e "\n\t\"mail._domainkey\": {" + echo -e "\n\t\"vmail._domainkey\": {" echo " \"TTL\": \"3600\"," echo " \"TXT\": \"'$pub'\"" echo -e "\t}\n}" @@ -34,7 +34,7 @@ json_list_dkim_dns() { # Shell function shell_list_dkim_dns() { echo "_domainkey 3600 IN TXT \"t=y; o=~;\"" - echo "mail._domainkey 3600 IN TXT \"k=rsa; p=$pub\"" + echo "vmail._domainkey 3600 IN TXT \"k=rsa; p=$pub\"" } From 7f86725710a7f15a04584bccf0c539eeef8c5964 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:02:36 +0300 Subject: [PATCH 05/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru и увеличение длины ключа до 1024 --- func/rebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/func/rebuild.sh b/func/rebuild.sh index a101d7bbb..e753de9e6 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -455,7 +455,7 @@ rebuild_mail_domain_conf() { U_MAIL_DKMI=$((U_MAIL_DKMI + 1)) pem="$USER_DATA/mail/$domain.pem" pub="$USER_DATA/mail/$domain.pub" - openssl genrsa -out $pem 512 &>/dev/null + openssl genrsa -out $pem 1024 &>/dev/null openssl rsa -pubout -in $pem -out $pub &>/dev/null cp $pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem @@ -473,7 +473,7 @@ rebuild_mail_domain_conf() { policy="\"t=y; o=~;\"" $BIN/v-add-dns-record $user $domain $record TXT "$policy" - record='mail._domainkey' + record='vmail._domainkey' p=$(cat $pub|grep -v ' KEY---'|tr -d '\n') slct="\"k=rsa\; p=$p\"" $BIN/v-add-dns-record $user $domain $record TXT "$slct" From a592df77e7b9361e28126c6e1fee25ae5ab284c1 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:11:17 +0300 Subject: [PATCH 06/14] Add template for pdd.yandex.ru --- install/ubuntu/templates/dns/yandex.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 install/ubuntu/templates/dns/yandex.tpl diff --git a/install/ubuntu/templates/dns/yandex.tpl b/install/ubuntu/templates/dns/yandex.tpl new file mode 100644 index 000000000..7c93db155 --- /dev/null +++ b/install/ubuntu/templates/dns/yandex.tpl @@ -0,0 +1,9 @@ +ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.ru.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a ip4:%ip% include:_spf.yandex.ru ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' From 3b4d9d715e2369376c2cdfa188e059ac836e6770 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:12:15 +0300 Subject: [PATCH 07/14] Add template for pdd.yandex.ru --- install/rhel/templates/dns/yandex.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 install/rhel/templates/dns/yandex.tpl diff --git a/install/rhel/templates/dns/yandex.tpl b/install/rhel/templates/dns/yandex.tpl new file mode 100644 index 000000000..7c93db155 --- /dev/null +++ b/install/rhel/templates/dns/yandex.tpl @@ -0,0 +1,9 @@ +ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.ru.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a ip4:%ip% include:_spf.yandex.ru ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' From 42c0e061a2e274b9c994fdeef157f96768a7a99c Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:13:14 +0300 Subject: [PATCH 08/14] Add template for pdd.yandex.ru --- install/debian/templates/dns/yandex.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 install/debian/templates/dns/yandex.tpl diff --git a/install/debian/templates/dns/yandex.tpl b/install/debian/templates/dns/yandex.tpl new file mode 100644 index 000000000..7c93db155 --- /dev/null +++ b/install/debian/templates/dns/yandex.tpl @@ -0,0 +1,9 @@ +ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='4' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.ru.' SUSPENDED='no' TIME='%time%' DATE='%date%' +ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a ip4:%ip% include:_spf.yandex.ru ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%' From b3e62baec477f34d91e8272ab4ff0be74cdf7037 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:14:28 +0300 Subject: [PATCH 09/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru --- install/debian/exim4.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/exim4.conf.template b/install/debian/exim4.conf.template index d33226c97..3909a599f 100644 --- a/install/debian/exim4.conf.template +++ b/install/debian/exim4.conf.template @@ -260,7 +260,7 @@ remote_smtp: driver = smtp #helo_data = $sender_address_domain dkim_domain = DKIM_DOMAIN - dkim_selector = mail + dkim_selector = vmail dkim_private_key = DKIM_PRIVATE_KEY dkim_canon = relaxed dkim_strict = 0 From ed99a3aebc12d1295079581b04274a2bdf4f0668 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:15:22 +0300 Subject: [PATCH 10/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru --- install/rhel/exim.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/exim.conf b/install/rhel/exim.conf index a21543d2d..a2c07b2c8 100644 --- a/install/rhel/exim.conf +++ b/install/rhel/exim.conf @@ -260,7 +260,7 @@ remote_smtp: driver = smtp #helo_data = $sender_address_domain dkim_domain = DKIM_DOMAIN - dkim_selector = mail + dkim_selector = vmail dkim_private_key = DKIM_PRIVATE_KEY dkim_canon = relaxed dkim_strict = 0 From 114f6f0c34082be89d2a892932a3fdd5336070d9 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 17:16:08 +0300 Subject: [PATCH 11/14] Change dkim_selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit изменение dkim_selector на vmail для совместимости с pdd.yandex.ru --- install/rhel/exim-smarthost.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/exim-smarthost.conf b/install/rhel/exim-smarthost.conf index 99b1c90c7..d1f7e7996 100644 --- a/install/rhel/exim-smarthost.conf +++ b/install/rhel/exim-smarthost.conf @@ -264,7 +264,7 @@ begin transports remote_smtp: driver = smtp dkim_domain = DKIM_DOMAIN - dkim_selector = mail + dkim_selector = vmail dkim_private_key = DKIM_PRIVATE_KEY dkim_canon = relaxed dkim_strict = 0 From 176161e3113bc9fc61e57de25754c420833d1f2e Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 18:42:00 +0300 Subject: [PATCH 12/14] Add dkim from yandex dns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Автоматическое добавление DKIM от Яндекс.ПДД --- func/rebuild.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/func/rebuild.sh b/func/rebuild.sh index e753de9e6..e333fed6a 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -477,6 +477,14 @@ rebuild_mail_domain_conf() { p=$(cat $pub|grep -v ' KEY---'|tr -d '\n') slct="\"k=rsa\; p=$p\"" $BIN/v-add-dns-record $user $domain $record TXT "$slct" + + if [ "$($BIN/v-list-dns-records $user $domain plain|grep -c '@ MX 10 mx.yandex.ru.')" = "1" ]; then + record='mail._domainkey' + slct=$(host -t TXT mail._domainkey.$domain dns1.yandex.net|grep v\=DKIM1|cut -d\" -f2) + if [ -n "$slct" ]; then + $BIN/v-add-dns-record $user $domain $record TXT "\"$slct\"" + fi + fi fi fi From e439d418232801ab9cf8ceae488669322f215a39 Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 18:44:30 +0300 Subject: [PATCH 13/14] Add dkim from yandex dns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Автоматическое добавление DKIM от Яндекс.ПДД --- bin/v-add-mail-domain | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 43aaac7cd..e765cc4f5 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -82,6 +82,14 @@ if [ "$dkim" = 'yes' ]; then record='vmail._domainkey' selector="\"k=rsa\; p=$p\"" $BIN/v-add-dns-record $user $domain $record TXT "$selector" + + if [ "$($BIN/v-list-dns-records $user $domain plain|grep -c '@ MX 10 mx.yandex.ru.')" = "1" ]; then + record='mail._domainkey' + selector=$(host -t TXT mail._domainkey.$domain dns1.yandex.net|grep v\=DKIM1|cut -d\" -f2) + if [ -n "$selector" ]; then + $BIN/v-add-dns-record $user $domain $record TXT "\"$selector\"" + fi + fi fi fi From 422325563ed7258c4a1cac640c34689af5c9a8bc Mon Sep 17 00:00:00 2001 From: kinolaev Date: Thu, 9 Jan 2014 18:46:01 +0300 Subject: [PATCH 14/14] Add dkim from yandex dns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Автоматическое добавление DKIM от Яндекс.ПДД --- bin/v-add-mail-domain-dkim | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 8c3b2143f..469c48626 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -69,6 +69,14 @@ if [ "$?" -eq 0 ]; then record='vmail._domainkey' selector="\"k=rsa\; p=$p\"" $BIN/v-add-dns-record $user $domain $record TXT "$selector" + + if [ "$($BIN/v-list-dns-records $user $domain plain|grep -c '@ MX 10 mx.yandex.ru.')" = "1" ]; then + record='mail._domainkey' + selector=$(host -t TXT mail._domainkey.$domain dns1.yandex.net|grep v\=DKIM1|cut -d\" -f2) + if [ -n "$selector" ]; then + $BIN/v-add-dns-record $user $domain $record TXT "\"$selector\"" + fi + fi fi