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

This commit is contained in:
kaiyou
2017-09-10 19:28:00 +02:00
2 changed files with 12 additions and 0 deletions

View File

@@ -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>