From 483443804255bfe114b6a351650ce3335e808459 Mon Sep 17 00:00:00 2001
From: Jaume Martin <jaumartin@gmail.com>
Date: Sun, 27 Aug 2017 20:24:15 +0200
Subject: [PATCH 1/2] Update .env.dist

---
 .env.dist | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.env.dist b/.env.dist
index 1a1f3b67..84eabf28 100644
--- a/.env.dist
+++ b/.env.dist
@@ -29,6 +29,10 @@ HOSTNAME=mail.mailu.io
 # Postmaster local part (will append the main mail domain)
 POSTMASTER=admin
 
+# DMARC rua and ruf email
+DMARC_RUA=admin
+DMARC_RUF=admin
+
 # Docker-compose project name, this will prepended to containers names.
 COMPOSE_PROJECT_NAME=mailu
 

From 5b6cba3b9e1051f4c68459b94b6cec97e1981f05 Mon Sep 17 00:00:00 2001
From: Jaume Martin <jaumartin@gmail.com>
Date: Sun, 27 Aug 2017 20:29:04 +0200
Subject: [PATCH 2/2] Update details.html

---
 admin/mailu/admin/templates/domain/details.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/admin/mailu/admin/templates/domain/details.html b/admin/mailu/admin/templates/domain/details.html
index 9a98f944..ba77201f 100644
--- a/admin/mailu/admin/templates/domain/details.html
+++ b/admin/mailu/admin/templates/domain/details.html
@@ -42,7 +42,15 @@
     </tr>
     <tr>
       <th>{% trans %}DNS DMARC entry{% endtrans %}</th>
+      {% if config["DMARC_RUA"] != "" and config["DMARC_RUF"] != "" %}
+      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }}; ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
+      {% elif config["DMARC_RUA"] != "" %}
+      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["DMARC_RUA"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
+      {% elif config["DMARC_RUF"] != "" %}
+      <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; ruf=mailto:{{ config["DMARC_RUF"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
+      {% else %}
       <td><pre>_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["POSTMASTER"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"</pre></td>
+      {% endif %}
     </tr>
     {% endif %}
   </tbody>