|
|
@@ -13,7 +13,6 @@
|
|
|
user=$1
|
|
|
domain=$(idn -t --quiet -u "$2" )
|
|
|
domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
|
|
|
-domain_idn=$(idn -t --quiet -a "$domain")
|
|
|
dkim_size=${3-1024}
|
|
|
|
|
|
# Includes
|
|
|
@@ -63,12 +62,12 @@ fi
|
|
|
# Adding dns records
|
|
|
if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
|
|
|
p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
|
|
|
- record="_domainkey.$domain_idn"
|
|
|
+ record="_domainkey"
|
|
|
policy="\"t=y; o=~;\""
|
|
|
$BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
|
|
|
|
|
|
- record="mail._domainkey.$domain_idn"
|
|
|
- selector="\"k=rsa\; p=$p\""
|
|
|
+ record="mail._domainkey"
|
|
|
+ selector="\"v=DKIM1\; k=rsa\; p=$p\""
|
|
|
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
|
|
|
fi
|
|
|
|