From 51896b938153d117f0ba3412a20a7cae980444cb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 24 Nov 2024 21:16:28 +0100
Subject: [PATCH] more proxy changes. login.pvv.ntnu.no only lets me in 50% of
 the time, but using "login2" may break once the cname is gone

---
 users/pbsds/home/profiles/ssh.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix
index c23b6e2..29d5e91 100644
--- a/users/pbsds/home/profiles/ssh.nix
+++ b/users/pbsds/home/profiles/ssh.nix
@@ -23,22 +23,26 @@
     "gogs.*".forwardX11 = false;
     "*.pbsds.net".forwardX11 = true;
     "*.pbsds.net".forwardX11Trusted = true;
+    "*.tail9aac63.ts.net".forwardX11 = true;
+    "*.tail9aac63.ts.net".forwardX11Trusted = true;
     "*.ntnu.no".user = "pederbs";
     "*.pvv.org".user = "pederbs";
-    "*.hpc.ntnu.no".proxyJump = "hildring.pvv.ntnu.no";
-    "*.idi.ntnu.no".proxyJump = "hildring.pvv.ntnu.no";
+    "*.pvv.org !login.pvv.org".proxyJump = "login.pvv.ntnu.no";
+    "*.pvv.ntnu.no !login.pvv.ntnu.no".proxyJump = "login.pvv.ntnu.no";
+    "*.hpc.ntnu.no".proxyJump = "login.pvv.ntnu.no";
+    "*.idi.ntnu.no".proxyJump = "login.pvv.ntnu.no";
 
     # me
-    "garp.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
-    "eple.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
-    "bolle.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
+    "garp.pbsds.net".proxyJump = "login.pvv.ntnu.no";
+    "eple.pbsds.net".proxyJump = "login.pvv.ntnu.no";
+    "bolle.pbsds.net".proxyJump = "login.pvv.ntnu.no";
     "pederbs.idi.ntnu.no" = {};
     "brumlebasse.pbsds.net".port = 2222;
     "knut.pbsds.net".port = 23;
     "nord.pbsds.net".port = 24;
     "sopp.pbsds.net".port = 26;
     "noximilien.pbsds.net" = {};
-    "rocm.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
+    "rocm.pbsds.net".proxyJump = "login.pvv.ntnu.no";
 
     # nixos org
     #"aarch64.nixos.community" = {};
@@ -102,6 +106,7 @@
     "eirin.pvv.ntnu.no" = {};
     "georg.pvv.ntnu.no" = {};
     "git.pvv.ntnu.no" = {};
+    "login.pvv.ntnu.no" = {};
     "orchid.pvv.ntnu.no" = {};
     "wegonke.pvv.ntnu.no" = {};
     "hildring.pvv.ntnu.no" = {};
@@ -130,7 +135,7 @@
 
     # fyrkat
     #"fyrkat.no".hostname = "fridge.fyrkat.no";
-    #"*.fyrkat.no".proxyJump = "hildring.pvv.ntnu.no";
+    #"*.fyrkat.no".proxyJump = "login.pvv.ntnu.no";
     "fridge.fyrkat.no".port = 222;
     /* "fil.fyrkat.no" = {}; */
   };