Merge branch 'master' of https://github.com/Xumeiquer/Mailu into Xumeiquer-master

.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
 

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>