Don't print echobot link when disabling mail

- On a fresh install, if cmdeploy is run the first time with the
  --disable-mail option, the echobot invite-link.txt file will not
  exist yet.
- Only print the echobot invite link if --disable-mail was not
  specified.  This fixes the fresh-install error case, and also makes
  sense when disabling mail in general, because the echo bot will not
  be available at that time.
This commit is contained in:
cliffmccarthy
2025-10-13 09:37:54 -05:00
committed by missytake
parent d7f50183ea
commit d720b8107d

View File

@@ -109,14 +109,15 @@ def run_cmd(args, out):
try: try:
retcode = out.check_call(cmd, env=env) retcode = out.check_call(cmd, env=env)
if retcode == 0: if retcode == 0:
print("\nYou can try out the relay by talking to this echo bot: ") if not args.disable_mail:
sshexec = SSHExec(args.config.mail_domain, verbose=args.verbose) print("\nYou can try out the relay by talking to this echo bot: ")
print( sshexec = SSHExec(args.config.mail_domain, verbose=args.verbose)
sshexec( print(
call=remote.rshell.shell, sshexec(
kwargs=dict(command="cat /var/lib/echobot/invite-link.txt"), call=remote.rshell.shell,
kwargs=dict(command="cat /var/lib/echobot/invite-link.txt"),
)
) )
)
out.green("Deploy completed, call `cmdeploy dns` next.") out.green("Deploy completed, call `cmdeploy dns` next.")
elif not remote_data["acme_account_url"]: elif not remote_data["acme_account_url"]:
out.red("Deploy completed but letsencrypt not configured") out.red("Deploy completed but letsencrypt not configured")