cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-18 04:58:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmdeploy: fixing DNS CLI output

Browse Source
This commit is contained in:
missytake
2023-12-13 04:30:24 +01:00
parent 50922fb1d2
commit 4199e04ab3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmdeploy/src/cmdeploy/cmdeploy.py
View File

@@ -127,14 +127,14 @@ def dns_cmd(args, out):
print() print()
if not dns.check_ptr_record(ipv4, args.config.mail_domain): if not dns.check_ptr_record(ipv4, args.config.mail_domain):
print( print(
f"You should add a PTR/reverse DNS entry for {ipv4}, with the value: {args.config.mail_domain}." f"You should add a PTR/reverse DNS entry for {ipv4}, with the value: {args.config.mail_domain}"
) )
print( print(
"You can do so at your hosting provider (maybe this isn't your DNS provider).\n" "You can do so at your hosting provider (maybe this isn't your DNS provider).\n"
) )
if not dns.check_ptr_record(ipv6, args.config.mail_domain): if not dns.check_ptr_record(ipv6, args.config.mail_domain):
print( print(
f"You should add a PTR/reverse DNS entry for {ipv6}, with the value: {args.config.mail_domain}." f"You should add a PTR/reverse DNS entry for {ipv6}, with the value: {args.config.mail_domain}"
) )
print( print(
"You can do so at your hosting provider (maybe this isn't your DNS provider).\n" "You can do so at your hosting provider (maybe this isn't your DNS provider).\n"
@@ -207,11 +207,13 @@ def dns_cmd(args, out):
current = dns.get("TXT", domain.strip()[:-1]).replace('" "', '"\n "') current = dns.get("TXT", domain.strip()[:-1]).replace('" "', '"\n "')
current = f"( {current} )" current = f"( {current} )"
if current.replace(";", "\\;") != data: if current.replace(";", "\\;") != data:
to_print.append("current: '" + current.replace(";", "\\;") + "'") to_print.append(dkim_entry)
to_print.append("expected: '" + data + "'")
if to_print: if to_print:
to_print.insert( to_print.insert(
0, "\nYou should configure the following DNS entries at your provider:\n" 0, "You should configure the following DNS entries at your provider:\n"
)
to_print.append(
"\nIf you already configured the DNS entries, don't worry. It can take a while until they are public."
) )
print("\n".join(to_print)) print("\n".join(to_print))
else: else: