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

cmdeploy: split @local and @docker in SSHExec

Browse Source
This commit is contained in:
missytake
2025-08-26 10:33:14 +02:00
parent 929383df88
commit d2ff812727
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdeploy/src/cmdeploy/cmdeploy.py
View File

@@ -101,7 +101,7 @@ def run_cmd(args, out):
ssh_host = args.config.mail_domain if not args.ssh_host else args.ssh_host ssh_host = args.config.mail_domain if not args.ssh_host else args.ssh_host
cmd = f"{pyinf} --ssh-user root {ssh_host} {deploy_path} -y" cmd = f"{pyinf} --ssh-user root {ssh_host} {deploy_path} -y"
if sshexec == "localhost": if sshexec in ["docker", "localhost"]:
cmd = f"{pyinf} @local {deploy_path} -y" cmd = f"{pyinf} @local {deploy_path} -y"
if version.parse(pyinfra.__version__) < version.parse("3"): if version.parse(pyinfra.__version__) < version.parse("3"):
@@ -368,6 +368,8 @@ def main(args=None):
host = args.ssh_host if hasattr(args, "ssh_host") and args.ssh_host else args.config.mail_domain host = args.ssh_host if hasattr(args, "ssh_host") and args.ssh_host else args.config.mail_domain
if host in [ "@local", "localhost" ]: if host in [ "@local", "localhost" ]:
return "localhost" return "localhost"
elif host == "docker":
return "docker"
print(f"[ssh] login to {host}") print(f"[ssh] login to {host}")
return SSHExec(host, verbose=args.verbose) return SSHExec(host, verbose=args.verbose)

2
docker/files/setup_chatmail_docker.sh
View File

@@ -70,7 +70,7 @@ fi
./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN ./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN
bash /update_ini.sh bash /update_ini.sh
./scripts/cmdeploy run --ssh-host @local --skip-dns-check ./scripts/cmdeploy run --ssh-host docker --skip-dns-check
echo "ForwardToConsole=yes" >> /etc/systemd/journald.conf echo "ForwardToConsole=yes" >> /etc/systemd/journald.conf
systemctl restart systemd-journald systemctl restart systemd-journald