nix-configs

commit 836801c44cb79689236ee1370a391af9de117b9d
parent acbc8b48c54a858cb1498d6981a94e16448ff3dc
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Tue,  5 Aug 2025 15:52:28 +0100

Use $sshport here too

Diffstat:
M
common/ssh-tunnel.nix
 | 
4
++--
M
machines/ilias.nix
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/ssh-tunnel.nix b/common/ssh-tunnel.nix
@@ -1,4 +1,4 @@
-{ pkgs, username, domain, ... }:
+{ pkgs, username, domain, sshport, ... }:
 
 {
   systemd.services.reverse-ssh-tunnel = {
@@ -8,7 +8,7 @@
     wantedBy = [ "multi-user.target" ];
 
     serviceConfig = {
-      ExecStart = "${pkgs.openssh}/bin/ssh -NTg -o ServerAliveInterval=30 -o ExitOnForwardFailure=yes -o StrictHostKeyChecking=accept-new -p 55012 -i /home/${username}/vault/docs/secure/ssh-key-2022-02-16.key -R 55013:localhost:22 ${username}@${domain}";
+      ExecStart = "${pkgs.openssh}/bin/ssh -NTg -o ServerAliveInterval=30 -o ExitOnForwardFailure=yes -o StrictHostKeyChecking=accept-new -p ${toString sshport} -i /home/${username}/vault/docs/secure/ssh-key-2022-02-16.key -R 55013:localhost:22 ${username}@${domain}";
       Restart = "always";
       RestartSec = "10s";
       User = "${username}";
diff --git a/machines/ilias.nix b/machines/ilias.nix
@@ -27,7 +27,7 @@ in {
     (import ../common/magnets.nix {inherit pkgs username;})
     ../common/packages.nix
     (import ../common/restic.nix {inherit pkgs username;})
-    (import ../common/ssh-tunnel.nix {inherit config pkgs username domain;})
+    (import ../common/ssh-tunnel.nix {inherit config pkgs username domain sshport;})
     (import ../common/ssh.nix {inherit username sshkey sshport;})
     (import ../common/syncthing.nix {inherit config pkgs username;})
     (import ../common/tank-log.nix {inherit pkgs username;})