summaryrefslogtreecommitdiff
path: root/accounts
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-02-06 16:42:35 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-02-06 16:42:35 +0100
commit93f07176317920ee881773519ee342f9c62ab9c9 (patch)
tree8876150049c83ac8257ac13e191f46fcef10c242 /accounts
parent5c02818571f5dbc93b0f848514dd4b55530f73c2 (diff)
downloadnixos-93f07176317920ee881773519ee342f9c62ab9c9.tar
nixos-93f07176317920ee881773519ee342f9c62ab9c9.tar.gz
nixos-93f07176317920ee881773519ee342f9c62ab9c9.tar.bz2
nixos-93f07176317920ee881773519ee342f9c62ab9c9.tar.xz
nixos-93f07176317920ee881773519ee342f9c62ab9c9.zip
sif: wgrz
Diffstat (limited to 'accounts')
-rw-r--r--accounts/gkleen@sif/default.nix8
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix9
2 files changed, 13 insertions, 4 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index b2e9d947..15351b0d 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -78,8 +78,12 @@ in {
78 PubkeyAcceptedAlgorithms +ssh-rsa 78 PubkeyAcceptedAlgorithms +ssh-rsa
79 ConnectTimeout 30 79 ConnectTimeout 30
80 80
81 Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null" 81 Match host *.mathinst.loc !host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
82 ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118 82 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
83 ProxyJump mathw0g
84
85 Match host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
86 HostName mathw0g.math.lmu.de
83 87
84 Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null" 88 Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
85 ProxyJump mathw0h 89 ProxyJump mathw0h
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index e7087c26..94ba4e9b 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -314,13 +314,13 @@
314 proxyJump = "mathw0h"; 314 proxyJump = "mathw0h";
315 }; 315 };
316 "mathw0g" = 316 "mathw0g" =
317 { hostname = "mathw0g.math.lmu.de"; 317 { hostname = "mathw0g.mathinst.loc";
318 }; 318 };
319 "mathw0h" = 319 "mathw0h" =
320 { hostname = "mathw0h.mathinst.loc"; 320 { hostname = "mathw0h.mathinst.loc";
321 }; 321 };
322 "proxy.mathw0g" = 322 "proxy.mathw0g" =
323 { hostname = "mathw0g.math.lmu.de"; 323 { hostname = "mathw0g.mathinst.loc";
324 extraOptions = { 324 extraOptions = {
325 ControlPath = "none"; 325 ControlPath = "none";
326 ServerAliveCountMax = "15"; 326 ServerAliveCountMax = "15";
@@ -352,6 +352,11 @@
352 proxyJump = "mathw0h"; 352 proxyJump = "mathw0h";
353 user = "root"; 353 user = "root";
354 }; 354 };
355 "vpn-wg01" =
356 { hostname = "vpn-wg01.mathinst.loc";
357 proxyJump = "mathw0h";
358 user = "root";
359 };
355 "repo-apt01" = 360 "repo-apt01" =
356 { hostname = "repo-apt01.mathinst.loc"; 361 { hostname = "repo-apt01.mathinst.loc";
357 proxyJump = "mathw0h"; 362 proxyJump = "mathw0h";