diff --git a/chatmaild/src/chatmaild/doveauth.service.f b/chatmaild/src/chatmaild/doveauth.service.f index 89926038..c60688d4 100644 --- a/chatmaild/src/chatmaild/doveauth.service.f +++ b/chatmaild/src/chatmaild/doveauth.service.f @@ -1,5 +1,5 @@ [Unit] -Description=Dict authentication proxy for dovecot +Description=Chatmail dict authentication proxy for dovecot [Service] ExecStart={execpath} /run/dovecot/doveauth.socket vmail /home/vmail/passdb.sqlite diff --git a/deploy-chatmail/src/deploy_chatmail/cmdeploy.py b/deploy-chatmail/src/deploy_chatmail/cmdeploy.py index 13938601..3f384031 100644 --- a/deploy-chatmail/src/deploy_chatmail/cmdeploy.py +++ b/deploy-chatmail/src/deploy_chatmail/cmdeploy.py @@ -68,6 +68,7 @@ def dns_cmd(args, out): ssh = f"ssh root@{args.config.mailname}" def shell_output(arg): + out(f"[{arg}]", file=sys.stderr) return subprocess.check_output(arg, shell=True).decode() def read_dkim_entries(entry): @@ -79,7 +80,6 @@ def dns_cmd(args, out): lines.append(line) return "\n".join(lines) - out(f"[retrieving info by invoking {ssh}]", file=sys.stderr) acme_account_url = shell_output(f"{ssh} -- acmetool account-url") dkim_entry = read_dkim_entries(shell_output(f"{ssh} -- opendkim-genzone -F"))