From 04c31638c6f4a440ea4ea95374785f954bc9fb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Sun, 28 Feb 2016 21:03:18 +0100 Subject: [PATCH] [fix] Append domain name to DKIM DNS record --- src/yunohost/domain.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index e42126f6e..34167dbf8 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -262,14 +262,14 @@ def domain_dns_conf(domain, ttl=None): pass else: dkim = re.match(( - r'^(?P[a-z_\-\.]+)[\s]+([0-9]+[\s]+)?IN[\s]+TXT[\s]+[^"]*' + r'^(?P[a-z_\-\.]+)[\s]+([0-9]+[\s]+)?IN[\s]+TXT[\s]+[^"]*' '(?=.*(;[\s]*|")v=(?P[^";]+))' '(?=.*(;[\s]*|")k=(?P[^";]+))' '(?=.*(;[\s]*|")p=(?P

[^";]+))'), dkim_content, re.M|re.S ) if dkim: - result += '{domain} {ttl} IN TXT "v={v}; k={k}; p={p}"'.format( - domain=dkim.group('domain'), ttl=ttl, + result += '{host} {ttl} IN TXT "v={v}; k={k}; p={p}"'.format( + host='{0}.{1}'.format(dkim.group('host'), domain), ttl=ttl, v=dkim.group('v'), k=dkim.group('k'), p=dkim.group('p') )