Merge pull request #253 from Mailu/Xumeiquer-master

Implement RUA and RUF for Dmarc

.env.dist

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

admin/mailu/__init__.py

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

admin/mailu/admin/templates/domain/details.html

@@ -42,7 +42,7 @@
     </tr>
     <tr>
       <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>
     {% endif %}
   </tbody>