docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #253 from Mailu/Xumeiquer-master

Browse Source 
Implement RUA and RUF for Dmarc
This commit is contained in:
kaiyou
2017-09-10 19:41:31 +02:00
committed by GitHub
parent 856d6176ca 03b352cbcd
commit 22b4315a26
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dist
View File

@@ -77,6 +77,10 @@ FETCHMAIL_DELAY=600
# e.g. localpart+custom@domain;tld # e.g. localpart+custom@domain;tld
RECIPIENT_DELIMITER=+ RECIPIENT_DELIMITER=+
# DMARC rua and ruf email
DMARC_RUA=admin
DMARC_RUF=admin
################################### ###################################
# Nginx settings # Nginx settings
################################### ###################################

2
admin/mailu/__init__.py
View File

@@ -27,6 +27,8 @@ default_config = {
'BOOTSTRAP_SERVE_LOCAL': True, 'BOOTSTRAP_SERVE_LOCAL': True,
'DKIM_PATH': '/dkim/{domain}.{selector}.key', 'DKIM_PATH': '/dkim/{domain}.{selector}.key',
'DKIM_SELECTOR': 'dkim', 'DKIM_SELECTOR': 'dkim',
'DMARC_RUA': None,
'DMARC_RUF': None,
'BABEL_DEFAULT_LOCALE': 'en', 'BABEL_DEFAULT_LOCALE': 'en',
'BABEL_DEFAULT_TIMEZONE': 'UTC', 'BABEL_DEFAULT_TIMEZONE': 'UTC',
'ENABLE_CERTBOT': False, 'ENABLE_CERTBOT': False,

2
admin/mailu/admin/templates/domain/details.html
View File

@@ -42,7 +42,7 @@
</tr> </tr>
<tr> <tr>
<th>{% trans %}DNS DMARC entry{% endtrans %}</th> <th>{% trans %}DNS DMARC entry{% endtrans %}</th>
<td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["POSTMASTER"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td> <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject;{% if config["DMARC_RUA"] %} rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }};{% endif %}{% if config["DMARC_RUF"] %} ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }};{% endif %} adkim=s; aspf=s"</pre></td>
</tr> </tr>
{% endif %} {% endif %}
</tbody> </tbody>