From 043817f7d52c7cdb7ae806a5f6b62f58acdaa1e8 Mon Sep 17 00:00:00 2001 From: "Geir O. Jerstad" Date: Fri, 4 Jul 2025 16:47:53 +0200 Subject: [PATCH] fix: ensure consistent sma user for all SSH operations - Add 'user' field mapping in get-ssh-config for compatibility - Add default identity-file (~/.ssh/id_ed25519_admin) for sma user - Fix update-flake function syntax error in deployment.scm - All SSH operations (deploy, status, health, ssh command) now use sma user consistently --- packages/lab-tool/lab/deployment.scm | 1 - packages/lab-tool/utils/config.scm | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/lab-tool/lab/deployment.scm b/packages/lab-tool/lab/deployment.scm index edf06c3..47275c9 100644 --- a/packages/lab-tool/lab/deployment.scm +++ b/packages/lab-tool/lab/deployment.scm @@ -63,5 +63,4 @@ ;; Update flake inputs - delegate to ssh-deploy module (define update-flake - "Update flake inputs (impure - has side effects)" (@ (lab ssh-deploy) update-flake)) diff --git a/packages/lab-tool/utils/config.scm b/packages/lab-tool/utils/config.scm index 51abd04..4ac1809 100644 --- a/packages/lab-tool/utils/config.scm +++ b/packages/lab-tool/utils/config.scm @@ -135,7 +135,9 @@ `((type . ,type) (hostname . ,hostname) (ssh-alias . ,ssh-alias) - (ssh-user . ,ssh-user) + (user . ,ssh-user) + (ssh-user . ,ssh-user) ; Keep both for compatibility + (identity-file . "~/.ssh/id_ed25519_admin") ; Default SSH key for sma user (is-local . ,(eq? type 'local)))) #f)))