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

always show which ssh-commands execute

Browse Source
This commit is contained in:
holger krekel
2023-12-11 01:43:09 +01:00
parent 5734e00625
commit 528cd3da25
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chatmaild/src/chatmaild/doveauth.service.f
View File

@@ -1,5 +1,5 @@
[Unit] [Unit]
Description=Dict authentication proxy for dovecot Description=Chatmail dict authentication proxy for dovecot
[Service] [Service]
ExecStart={execpath} /run/dovecot/doveauth.socket vmail /home/vmail/passdb.sqlite ExecStart={execpath} /run/dovecot/doveauth.socket vmail /home/vmail/passdb.sqlite

2
deploy-chatmail/src/deploy_chatmail/cmdeploy.py
View File

@@ -68,6 +68,7 @@ def dns_cmd(args, out):
ssh = f"ssh root@{args.config.mailname}" ssh = f"ssh root@{args.config.mailname}"
def shell_output(arg): def shell_output(arg):
out(f"[{arg}]", file=sys.stderr)
return subprocess.check_output(arg, shell=True).decode() return subprocess.check_output(arg, shell=True).decode()
def read_dkim_entries(entry): def read_dkim_entries(entry):
@@ -79,7 +80,6 @@ def dns_cmd(args, out):
lines.append(line) lines.append(line)
return "\n".join(lines) return "\n".join(lines)
out(f"[retrieving info by invoking {ssh}]", file=sys.stderr)
acme_account_url = shell_output(f"{ssh} -- acmetool account-url") acme_account_url = shell_output(f"{ssh} -- acmetool account-url")
dkim_entry = read_dkim_entries(shell_output(f"{ssh} -- opendkim-genzone -F")) dkim_entry = read_dkim_entries(shell_output(f"{ssh} -- opendkim-genzone -F"))