diff --git a/admin/freeposte/admin/models.py b/admin/freeposte/admin/models.py index 732d8538..f2a2338c 100644 --- a/admin/freeposte/admin/models.py +++ b/admin/freeposte/admin/models.py @@ -55,7 +55,9 @@ class Domain(Base): @property def dkim_publickey(self): - return dkim.strip_key(self.dkim_key).decode("utf8") + dkim_key = self.dkim_key + if dkim_key: + return dkim.strip_key(self.dkim_key).decode("utf8") def generate_dkim_key(self): self.dkim_key = dkim.gen_key() diff --git a/admin/freeposte/admin/templates/domain/details.html b/admin/freeposte/admin/templates/domain/details.html index 05488b51..73fa3c80 100644 --- a/admin/freeposte/admin/templates/domain/details.html +++ b/admin/freeposte/admin/templates/domain/details.html @@ -31,6 +31,7 @@ Domain details {{ domain.name }}. 600 IN TXT "v=spf1 mx a:{{ config["HOSTNAME"] }} -all" {{ domain.name }}. 600 IN SPF "v=spf1 mx a:{{ config["HOSTNAME"] }} -all" + {% if domain.dkim_publickey %}
{{ domain.dkim_publickey }}
_dmarc.{{ domain.name }}. 600 IN TXT "v=DMARC1; p=reject; rua=mailto:{{ config["POSTMASTER"] }}@{{ config["DOMAIN"] }}; adkim=s; aspf=s"