From 57ba52818c7c418ce2df619e1c2fed19429442bb Mon Sep 17 00:00:00 2001 From: pober Date: Wed, 27 May 2026 09:52:50 +0200 Subject: [PATCH] Cleanup after merge; pauls ssh key now works for vpn.: --- src/provision.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/provision.py b/src/provision.py index 8aa8726..d5eaecf 100644 --- a/src/provision.py +++ b/src/provision.py @@ -442,14 +442,14 @@ def step_add_ssh_key(iot_host: str): "set -e\n" "mkdir -p ~/.ssh\n" "chmod 700 ~/.ssh\n" - "echo " + shlex.quote(ssh_key) + " >> ~/.ssh/authorized_keys\n" + "touch ~/.ssh/authorized_keys\n" "chmod 600 ~/.ssh/authorized_keys\n" + "grep -qF " + shlex.quote(ssh_key) + " ~/.ssh/authorized_keys " + "|| echo " + shlex.quote(ssh_key) + " >> ~/.ssh/authorized_keys\n" "echo 'SSH key for paul added successfully'\n" ) - - ssh_cmd = ["ssh", "-p", str(SSH_PORT)] - if SSH_KEY: - ssh_cmd += ["-i", SSH_KEY] + + ssh_cmd = ["ssh", "-p", str(SSH_PORT)] + _ssh_base_opts() ssh_cmd += [f"{SSH_USER}@{iot_host}", remote] proc = subprocess.run(ssh_cmd, check=False, capture_output=True, text=True) @@ -509,7 +509,7 @@ def main(): ap.add_argument( "--steps", nargs="+", - choices=["pull", "wg", "hostname", "mac", "add_ssh_key", "update_app", "start_app", "finish", "all"], + choices=["pull", "wg", "hostname", "mac", "add_ssh_key", "system_update", "update_app", "start_app", "finish", "all"], default=["all"], help="Which steps to run. Default: all", )