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

consistently show ssh/shell output

Browse Source
This commit is contained in:
holger krekel
2023-12-11 01:50:56 +01:00
parent 02adb758ff
commit 9e9d5b7698
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,10 +67,6 @@ def dns_cmd(args, out):
template = importlib.resources.files(__package__).joinpath("chatmail.zone.f") template = importlib.resources.files(__package__).joinpath("chatmail.zone.f")
ssh = f"ssh root@{args.config.mailname}" 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): def read_dkim_entries(entry):
lines = [] lines = []
for line in entry.split("\n"): for line in entry.split("\n"):
@@ -80,8 +76,8 @@ def dns_cmd(args, out):
lines.append(line) lines.append(line)
return "\n".join(lines) return "\n".join(lines)
acme_account_url = shell_output(f"{ssh} -- acmetool account-url") acme_account_url = out.shell_output(f"{ssh} -- acmetool account-url")
dkim_entry = read_dkim_entries(shell_output(f"{ssh} -- opendkim-genzone -F")) dkim_entry = read_dkim_entries(out.shell_output(f"{ssh} -- opendkim-genzone -F"))
out( out(
f"[writing {args.config.mailname} zone data (using space as separator) to stdout output]", f"[writing {args.config.mailname} zone data (using space as separator) to stdout output]",
@@ -105,19 +101,14 @@ def status_cmd(args, out):
ssh = f"ssh root@{args.config.mailname}" ssh = f"ssh root@{args.config.mailname}"
def shell_output(arg):
return subprocess.check_output(arg, shell=True).decode()
out.green(f"chatmail domain: {args.config.mailname}") out.green(f"chatmail domain: {args.config.mailname}")
if args.config.privacy_mail: if args.config.privacy_mail:
out.green("privacy settings: present") out.green("privacy settings: present")
else: else:
out.red("no privacy settings") out.red("no privacy settings")
out(f"[retrieving info by invoking {ssh}]", file=sys.stderr)
s1 = "systemctl --type=service --state=running" s1 = "systemctl --type=service --state=running"
for line in shell_output(f"{ssh} -- {s1}").split("\n"): for line in out.shell_output(f"{ssh} -- {s1}").split("\n"):
if line.startswith(" "): if line.startswith(" "):
print(line) print(line)
@@ -170,6 +161,10 @@ class Out:
color = "red" if red else ("green" if green else None) color = "red" if red else ("green" if green else None)
print(colored(msg, color), file=file) print(colored(msg, color), file=file)
def shell_output(self, arg):
self(f"[$ {arg}]", file=sys.stderr)
return subprocess.check_output(arg, shell=True).decode()
def add_config_option(parser): def add_config_option(parser):
parser.add_argument( parser.add_argument(