Explorar o código

Merge pull request #1020 from eka7a/patch-2 - reverting DKIM commit

Reverting https://github.com/serghey-rodin/vesta/commit/721731dbd54781bfdb2ad266556b07c03f699a0d
dpeca %!s(int64=9) %!d(string=hai) anos
pai
achega
ae2d1609e2
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      bin/v-add-mail-domain-dkim

+ 3 - 3
bin/v-add-mail-domain-dkim

@@ -65,12 +65,12 @@ fi
 # Adding dns records
 # Adding dns records
 if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
 if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
     p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
     p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
-    record="_domainkey.$domain_idn"
+    record="_domainkey"
     policy="\"t=y; o=~;\""
     policy="\"t=y; o=~;\""
     $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
     $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"
     $BIN/v-add-dns-record $user $domain $record TXT "$selector"
 fi
 fi