1 |
jcrisp |
1.1 |
diff -ruN smeserver-qpsmtpd-2.7.0.old/root/sbin/e-smith/qpsmtpd-print-dns smeserver-qpsmtpd-2.7.0/root/sbin/e-smith/qpsmtpd-print-dns |
2 |
|
|
--- smeserver-qpsmtpd-2.7.0.old/root/sbin/e-smith/qpsmtpd-print-dns 2022-05-18 12:09:40.491731916 +0100 |
3 |
|
|
+++ smeserver-qpsmtpd-2.7.0/root/sbin/e-smith/qpsmtpd-print-dns 2022-05-18 13:25:56.736515792 +0100 |
4 |
|
|
@@ -20,10 +20,21 @@ |
5 |
|
|
|
6 |
|
|
print <<'_EOF'; |
7 |
|
|
|
8 |
|
|
-Here are sample DNS entries you should add in your public DNS |
9 |
|
|
-The DKIM entry can be copied as is, but others will probably need to be adjusted |
10 |
|
|
-to your need. For example, you should either change the reporting email adress |
11 |
|
|
-for DMARC (or create the needed pseudonym) |
12 |
|
|
+Here are sample DNS entries you should add in your public DNS. |
13 |
|
|
+ |
14 |
|
|
+There are two DKIM key copies. |
15 |
|
|
+Depending on your provider you might be able to copy these as is. |
16 |
|
|
+ |
17 |
|
|
+The first has a complete DKIM key with no "" breaks. |
18 |
|
|
+ |
19 |
|
|
+The second has the DKIM entry broken into 255 character chunks |
20 |
|
|
+with quotes for providers who cannot support long strings. |
21 |
|
|
+You may need to separate these with either a space, a newline or |
22 |
|
|
+a backslash escaped newline between the "" depending on your |
23 |
|
|
+dns provider. |
24 |
|
|
+ |
25 |
|
|
+You should either change the reporting email address for DMARC |
26 |
|
|
+or create the needed pseudonym 'dmarc-feedback'. |
27 |
|
|
|
28 |
|
|
_EOF |
29 |
|
|
|
30 |
|
|
@@ -41,13 +52,27 @@ |
31 |
|
|
chomp $selector; |
32 |
|
|
close SEL; |
33 |
|
|
|
34 |
|
|
+ |
35 |
|
|
+print "DKIM complete\n"; |
36 |
|
|
+print "=============\n"; |
37 |
|
|
+print " \n"; |
38 |
|
|
+print "$selector._domainkey IN TXT $key_string\n"; |
39 |
|
|
+ |
40 |
|
|
+ |
41 |
|
|
my @key_chunks = ( $key_string =~ /.{1,255}/g ); |
42 |
|
|
my $txt = ''; |
43 |
|
|
$txt .= '"' . $_ . '"' foreach (@key_chunks); |
44 |
|
|
|
45 |
|
|
-print <<"_EOF"; |
46 |
|
|
+print " \n"; |
47 |
|
|
+print "DKIM in 255 character chunks\n"; |
48 |
|
|
+print "============================\n"; |
49 |
|
|
+print " \n"; |
50 |
|
|
|
51 |
|
|
+print <<"_EOF"; |
52 |
|
|
$selector._domainkey IN TXT $txt |
53 |
|
|
+\n |
54 |
|
|
+DMARC records |
55 |
|
|
+============= |
56 |
|
|
\@ IN SPF "v=spf1 mx a -all" |
57 |
|
|
\@ IN TXT "v=spf1 mx a -all" |
58 |
|
|
_dmarc IN TXT "v=DMARC1; p=none; adkim=s; aspf=r; rua=mailto:dmarc-feedback\@$domain; pct=100" |