summaryrefslogtreecommitdiff
path: root/accounts/gkleen@sif
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-08 14:36:50 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-08 14:36:50 +0200
commitbe06f04babc12fb60366c24a22561c1d46895c80 (patch)
tree8df057a3605a7272cb048043be7593b5c944a67c /accounts/gkleen@sif
parenta6754d729f2d16cfdcb3570891c038a14718de1f (diff)
parentbc90ef66903e78713db1fd3a700785572b794cde (diff)
downloadnixos-be06f04babc12fb60366c24a22561c1d46895c80.tar
nixos-be06f04babc12fb60366c24a22561c1d46895c80.tar.gz
nixos-be06f04babc12fb60366c24a22561c1d46895c80.tar.bz2
nixos-be06f04babc12fb60366c24a22561c1d46895c80.tar.xz
nixos-be06f04babc12fb60366c24a22561c1d46895c80.zip
Merge commit 'bc90ef66' into flakes
Diffstat (limited to 'accounts/gkleen@sif')
-rw-r--r--accounts/gkleen@sif/default.nix3
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix5
2 files changed, 7 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2e7a25c9..87cd9e2f 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -143,7 +143,7 @@ in {
143 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118 143 # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
144 ProxyJump ssh.math.lmu.de 144 ProxyJump ssh.math.lmu.de
145 145
146 Match host *.cipmath.loc !host cip04.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null" 146 Match host *.cipmath.loc !host cip04.cipmath.loc,mgmt-cls01.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
147 ProxyJump cip04 147 ProxyJump cip04
148 148
149 Match host *.ifi.lmu.de,*.math.lmu.de 149 Match host *.ifi.lmu.de,*.math.lmu.de
@@ -225,6 +225,7 @@ in {
225 scrot = "$HOME/screenshots"; 225 scrot = "$HOME/screenshots";
226 flk = "$HOME/config/nixos-flakes"; 226 flk = "$HOME/config/nixos-flakes";
227 rz = "$HOME/projects/rz"; 227 rz = "$HOME/projects/rz";
228 pro = "$HOME/projects/pro";
228 }; 229 };
229 230
230 obs-studio = { 231 obs-studio = {
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 8a34376a..ac930614 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -445,6 +445,11 @@
445 { hostname = "cip04.cipmath.loc"; 445 { hostname = "cip04.cipmath.loc";
446 proxyJump = "mathw0h"; 446 proxyJump = "mathw0h";
447 }; 447 };
448 "mgmt-cls01" =
449 { user = "root";
450 hostname = "mgmt-cls01.cipmath.loc";
451 proxyJump = "ssh.math.lmu.de";
452 };
448 "mgmt01" = 453 "mgmt01" =
449 { hostname = "mgmt01.mathinst.loc"; 454 { hostname = "mgmt01.mathinst.loc";
450 proxyJump = "mathw0h"; 455 proxyJump = "mathw0h";