Fix mail dkim handling
This commit is contained in:
parent
13bd4df3fb
commit
c4d26d3a41
3 changed files with 26 additions and 25 deletions
|
@ -1,23 +1,34 @@
|
|||
|
||||
function mx_default(dkim) {
|
||||
return [
|
||||
function mx_default(no_send) {
|
||||
result = [
|
||||
CNAME("autoconfig", "mail.serguzim.me."),
|
||||
CNAME("autodiscover", "mail.serguzim.me."),
|
||||
SRV("_autodiscover._tcp", 1, 1, 443, "mail.serguzim.me."),
|
||||
|
||||
TXT("*", "v=spf1 -all"),
|
||||
TXT("@", "v=spf1 mx -all"),
|
||||
TXT("mail-ses", "v=spf1 include:amazonses.com -all"),
|
||||
|
||||
TXT("_dmarc", "v=DMARC1; p=quarantine; rua=mailto:dmarcreports@serguzim.me; ruf=mailto:dmarcreports@serguzim.me; rf=afrf; sp=quarantine; fo=1; pct=100; ri=604800; adkim=r; aspf=r"),
|
||||
TXT("dkim._domainkey", "v=DKIM1; k=rsa; t=s; s=email; p=" + dkim),
|
||||
TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:dmarcreports@serguzim.me"),
|
||||
|
||||
TLSA("_25._tcp", 3, 1, 1, "70143145ab67680a3b61fe2d0eb63319625fa086f845cce59afdbf1dad79e561"),
|
||||
|
||||
MX("@", 10, "mail.serguzim.me."),
|
||||
MX("*", 10, "mail.serguzim.me."),
|
||||
MX("mail-ses", 10, "feedback-smtp.eu-north-1.amazonses.com.")
|
||||
];
|
||||
|
||||
if (no_send) {
|
||||
result.push(
|
||||
TXT("*", "v=spf1 -all"),
|
||||
TXT("@", "v=spf1 -all"),
|
||||
);
|
||||
} else {
|
||||
result.push(
|
||||
TXT("*", "v=spf1 -all"),
|
||||
TXT("@", "v=spf1 mx -all"),
|
||||
TXT("mail-ses", "v=spf1 include:amazonses.com -all"),
|
||||
|
||||
MX("mail-ses", 10, "feedback-smtp.eu-north-1.amazonses.com."),
|
||||
);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function pgp_verify() {
|
||||
|
@ -33,8 +44,9 @@ function all_defaults(domain, add_pgp) {
|
|||
result.push(pgp_verify());
|
||||
}
|
||||
|
||||
if (dkim[domain]) {
|
||||
result.push(mx_default(dkim[domain]));
|
||||
if (dkim_ses[domain]) {
|
||||
result.push(mx_default(false));
|
||||
result.push(verify_amazon_ses(dkim_ses[domain]));
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue