From 54c772e137593127eda4ffb37a846c9f326222ba Mon Sep 17 00:00:00 2001
From: Leon Morival <leon.morival@gmail.com>
Date: Tue, 19 May 2026 19:20:44 +0200
Subject: [PATCH] feat: fix networks

---
 .gitea/workflows/deploy.yml | 22 +++++++++++++++++-----
 config/deploy.yml           |  1 +
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 4298e3f..da7eb28 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -81,7 +81,22 @@ jobs:
               chmod 700 /root/.ssh
               printf "%s\n" "$SSH_PRIVATE_KEY" | tr -d "\r" > /root/.ssh/id_ed25519
               chmod 600 /root/.ssh/id_ed25519
-              ssh-keyscan -H "${SSH_HOST:-89.167.35.217}" >> /root/.ssh/known_hosts
+
+              REMOTE_HOST="${SSH_HOST:-89.167.35.217}"
+              REMOTE_USER="${SSH_USER:-root}"
+
+              mkdir -p /workdir/.ssh
+              cat > /workdir/.ssh/config <<'"'"'SSH_CONFIG'"'"'
+          Host *
+            IdentityFile /root/.ssh/id_ed25519
+            IdentitiesOnly yes
+            StrictHostKeyChecking yes
+            UserKnownHostsFile /workdir/.ssh/known_hosts
+            GlobalKnownHostsFile /dev/null
+            CheckHostIP no
+          SSH_CONFIG
+              ssh-keyscan -H "$REMOTE_HOST" > /workdir/.ssh/known_hosts
+              chmod 600 /workdir/.ssh/config /workdir/.ssh/known_hosts
 
               mkdir -p .kamal
               cat > .kamal/secrets <<'"'"'SECRETS'"'"'
@@ -94,10 +109,7 @@ jobs:
           SECRETS
               chmod 600 .kamal/secrets
 
-              REMOTE_HOST="${SSH_HOST:-89.167.35.217}"
-              REMOTE_USER="${SSH_USER:-root}"
-
-              ssh "$REMOTE_USER@$REMOTE_HOST" <<'"'"'REMOTE'"'"'
+              ssh -F /workdir/.ssh/config "$REMOTE_USER@$REMOTE_HOST" <<'"'"'REMOTE'"'"'
           set -eu
 
           docker network inspect bemeal_public >/dev/null 2>&1 || docker network create bemeal_public
diff --git a/config/deploy.yml b/config/deploy.yml
index d6dabd1..22d4e06 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -41,6 +41,7 @@ registry:
 
 ssh:
   user: <%= ENV.fetch("SSH_USER", "root") %>
+  config: .ssh/config
 
 builder:
   arch: amd64