diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-01-23 16:43:44 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-01-23 16:43:44 +0100 |
| commit | 2d60c31d43857bca20faf77dd112327fb6a112fc (patch) | |
| tree | 6c856065de930157712d671dc87a5c07628107b7 | |
| parent | c1c8242845b1006f0cccef7211deef8195cbd1b0 (diff) | |
| download | nixos-2d60c31d43857bca20faf77dd112327fb6a112fc.tar nixos-2d60c31d43857bca20faf77dd112327fb6a112fc.tar.gz nixos-2d60c31d43857bca20faf77dd112327fb6a112fc.tar.bz2 nixos-2d60c31d43857bca20faf77dd112327fb6a112fc.tar.xz nixos-2d60c31d43857bca20faf77dd112327fb6a112fc.zip | |
gkleen@sif: webdev@lrz
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 2 | ||||
| -rw-r--r-- | accounts/gkleen@sif/ssh-hosts.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 6599b5fa..b2e9d947 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix | |||
| @@ -67,7 +67,7 @@ in { | |||
| 67 | home-manager.users.${userName} = { | 67 | home-manager.users.${userName} = { |
| 68 | programs = { | 68 | programs = { |
| 69 | ssh = { | 69 | ssh = { |
| 70 | matchBlocks = import ./ssh-hosts.nix; # customUtils.nixImport { dir = ./ssh-hosts; }; | 70 | matchBlocks = import ./ssh-hosts.nix { inherit pkgs; }; # customUtils.nixImport { dir = ./ssh-hosts; }; |
| 71 | extraConfig = '' | 71 | extraConfig = '' |
| 72 | Match host uniworx3.ifi.lmu.de,uniworx4.ifi.lmu.de,uniworx5.ifi.lmu.de,uni2workgw.ifi.lmu.de,blackbeard.tcs.ifi.lmu.de,gitlab2.rz.ifi.lmu.de,oregon.tcs.ifi.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null" | 72 | Match host uniworx3.ifi.lmu.de,uniworx4.ifi.lmu.de,uniworx5.ifi.lmu.de,uni2workgw.ifi.lmu.de,blackbeard.tcs.ifi.lmu.de,gitlab2.rz.ifi.lmu.de,oregon.tcs.ifi.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null" |
| 73 | ProxyJump remote.cip.ifi.lmu.de | 73 | ProxyJump remote.cip.ifi.lmu.de |
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix index aab9e5b4..938e5af7 100644 --- a/accounts/gkleen@sif/ssh-hosts.nix +++ b/accounts/gkleen@sif/ssh-hosts.nix | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | { pkgs, ... }: | ||
| 1 | { | 2 | { |
| 2 | "git.ymir" = | 3 | "git.ymir" = |
| 3 | { hostname = "ymir.yggdrasil.li"; | 4 | { hostname = "ymir.yggdrasil.li"; |
| @@ -382,4 +383,7 @@ | |||
| 382 | proxyJump = "vidhar"; | 383 | proxyJump = "vidhar"; |
| 383 | identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil"; | 384 | identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil"; |
| 384 | }; | 385 | }; |
| 386 | "webdev02-mwn.lrz.de" = | ||
| 387 | { proxyCommand = "${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118"; | ||
| 388 | }; | ||
| 385 | } | 389 | } |
