feat: awesome, socket is working.

client/run-deploy-remote-cli.py

@@ -99,10 +99,7 @@ def clear_keys():
 
 try:
     subprocess.run([
-        "ssh", ssh_address, "--", env_token, env_key, "doas", "/opt/run-deploy/bin/run-deploy-cli"
+        "ssh", ssh_address, "--", env_token, env_key, "/opt/run-deploy/bin/run-deploy-socket", "cli"
     ] + sys.argv[2:], check=True)
-    # subprocess.run([
-    #     "ssh", ssh_address, "--", env_token, env_key, "/opt/run-deploy/bin/run-deploy-socket", "cli"
-    # ] + sys.argv[2:], check=True)
 except subprocess.CalledProcessError as e:
     exit(e.returncode)

client/run-deploy-remote-metal-cli.py

@@ -98,10 +98,7 @@ def clear_keys():
 
 try:
     subprocess.run([
-        "ssh", ssh_address, "--", env_token, env_key, "doas", "/opt/run-deploy/bin/run-deploy-metal-cli"
+        "ssh", ssh_address, "--", env_token, env_key, "/opt/run-deploy/bin/run-deploy-socket", "cli-metal"
     ] + sys.argv[2:], check=True)
-    # subprocess.run([
-    #     "ssh", ssh_address, "--", env_token, env_key, "/opt/run-deploy/bin/run-deploy-socket", "cli-metal"
-    # ] + sys.argv[2:], check=True)
 except subprocess.CalledProcessError as e:
     exit(e.returncode)

remote-incus/run-deploy-socket.py

@@ -15,9 +15,9 @@ def handle_fifo(fifo_path: str):
         time.sleep(1)
     with open(fifo_path, "r") as fifo:
         data = json.load(fifo)
-    if data["code"] > 0:
+    if (data["stderr"]):
         print(data["stderr"], file=sys.stderr)
-    else:
+    if (data["stdout"]):
         print(data["stdout"])
     exit(data["code"])
 

remote-metal/run-deploy-socket.py

@@ -15,9 +15,9 @@ def handle_fifo(fifo_path: str):
         time.sleep(1)
     with open(fifo_path, "r") as fifo:
         data = json.load(fifo)
-    if data["code"] > 0:
+    if (data["stderr"]):
         print(data["stderr"], file=sys.stderr)
-    else:
+    if (data["stdout"]):
         print(data["stdout"])
     exit(data["code"])
 

toml-util/run-deploy-remote-toml.py

@@ -199,7 +199,7 @@ def create(cls, data: dict) -> Self:
 toml_manifest = None
 
 remote_cli = "run-deploy-remote-cli"
-remote_deploy = "/opt/run-deploy/bin/run-deploy"
+remote_deploy = "deploy"
 
 
 process_error_message = "Did you check that you got the SSH Private Key in the agent? Does `minisign.key` require a password? =D"
@@ -405,10 +405,10 @@ def create(cls, data: dict) -> Self:
     for ssh_address, ssh_config in deploy_data.ssh_configs.items():
         current_remote_deploy = remote_deploy
         if ssh_config.is_metal:
-            current_remote_deploy = "/opt/run-deploy/bin/run-deploy-metal"
+            current_remote_deploy = "deploy-metal"
         print(f"-- Deploying: {ssh_address} --", file=sys.stderr)
         process_data = subprocess.run([
-            "ssh", ssh_address, "--", "doas", current_remote_deploy,
+            "ssh", ssh_address, "--", "/opt/run-deploy/bin/run-deploy-socket", current_remote_deploy,
             f"{ssh_config.upload}/{base_image_name}",
             f"{key_ref}"
         ], check=True, capture_output=True)