aboutsummaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorErik Arvstedt <erik.arvstedt@gmail.com>2021-11-19 23:42:56 +0100
committerErik Arvstedt <erik.arvstedt@gmail.com>2021-11-20 14:28:54 +0100
commit9fc8cbf8e826d4c8a118f37202ab3f335341082a (patch)
treece553f6ded649b4b33772b4dd6c4d205a27de5ca /pkgs
parent05f0d3b5c1d38fbbd53142362a7821cc8bc1150a (diff)
target: use default port from SSH config
This is the expected behavior. The SSH config is also implicitly used for other SSH-related settings.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/krops/default.nix3
-rw-r--r--pkgs/populate/default.nix3
2 files changed, 2 insertions, 4 deletions
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
]);