From 9fc8cbf8e826d4c8a118f37202ab3f335341082a Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 19 Nov 2021 23:42:56 +0100
Subject: target: use default port from SSH config

This is the expected behavior.
The SSH config is also implicitly used for other SSH-related settings.
---
 pkgs/krops/default.nix    | 3 +--
 pkgs/populate/default.nix | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index d092307..7fe8370 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -20,8 +20,7 @@ in
       else
         writers.writeDash "krops.${target.host}.${lib.firstWord command}" ''
           exec ${openssh}/bin/ssh ${lib.escapeShellArgs (lib.flatten [
-            (lib.optionals (target.user != "") ["-l" target.user])
-            "-p" target.port
+            (lib.mkUserPortSSHOpts target)
             (if allocateTTY then "-t" else "-T")
             target.extraOptions
             target.host
diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index ee2e5db..bf6f76d 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -224,8 +224,7 @@ let
 
   ssh' = target: concatMapStringsSep " " quote (flatten [
     "${openssh}/bin/ssh"
-    (optionals (target.user != "") ["-l" target.user])
-    "-p" target.port
+    (mkUserPortSSHOpts target)
     "-T"
     target.extraOptions
   ]);
-- 
cgit v1.2.3