From 128392129ce98836c12fbb1f8eacf85dfbbc6af2 Mon Sep 17 00:00:00 2001
From: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:14:10 -0700
Subject: [PATCH 1/4] MNT: change jump host from pslogin to s3dflogin

---
 off_site/ssh/config | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/off_site/ssh/config b/off_site/ssh/config
index 70f94e7..3a6399c 100644
--- a/off_site/ssh/config
+++ b/off_site/ssh/config
@@ -7,9 +7,9 @@
 # You should use it on your own laptop and *not* place this in your PCDS
 # home directory configuration.
 
-Host pslogin
-    HostName pslogin.slac.stanford.edu
-    # ControlMaster can allow you to multiplex pslogin connections!
+Host s3dflogin
+    HostName s3dflogin.slac.stanford.edu
+    # ControlMaster can allow you to multiplex s3dflogin connections!
     # ControlMaster auto
     # ControlPath ~/.SSH-%r@%h:%p
 
@@ -38,22 +38,22 @@ Host psbuild
     #   which host to jump through.
     # * The ${PS_JUMP_HOST=...} syntax provides a default host to jump through,
     #   which we set to "pslogin" here.
-    ProxyJump %r@${PS_JUMP_HOST=centos7}
+    ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
     # We can share local environment variables, if we choose:
     # SendEnv TMUX_SESSION_NAME
 
 Host psbuild-rhel7
     HostName psbuild-rhel7-01
-    ProxyJump %r@${PS_JUMP_HOST=centos7}
+    ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
 
 Host psdev
     HostName psdev
-    ProxyJump %r@${PS_JUMP_HOST=centos7}
+    ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
 
 # plcprog-console access
 Host psbuild-plc
     HostName psbuild-rhel7
-    ProxyJump %r@${PS_JUMP_HOST=centos7}
+    ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
     ExitOnForwardFailure yes
     ForwardAgent no
     LocalForward localhost:3389 plcprog-console:3389
@@ -63,7 +63,7 @@ Host psbuild-plc
 
 Host psbuild-socks
     HostName psbuild-rhel7
-    ProxyJump %r@${PS_JUMP_HOST=centos7}
+    ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
     ForwardAgent no
     DynamicForward localhost:8080
     ExitOnForwardFailure yes
@@ -79,12 +79,11 @@ Host psbuild-socks
 
 # pscron - used for scheduling cron job tasks
 Host pscron
-    ProxyJump %r@${PS_JUMP_HOST=centos7}
+    ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
 
 # s3df data center
 Host s3df
     HostName s3dflogin.slac.stanford.edu
-    ProxyJump %r@${PS_JUMP_HOST}
 
 
 # Additional hosts from netconfig, hopping through psbuild-rhel7:

From 357bafd4ac5819cbf9255594f67e37a094839447 Mon Sep 17 00:00:00 2001
From: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:32:03 -0700
Subject: [PATCH 2/4] MNT: remove duplicate s3df entry

---
 off_site/ssh/config | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/off_site/ssh/config b/off_site/ssh/config
index 3a6399c..73b3bae 100644
--- a/off_site/ssh/config
+++ b/off_site/ssh/config
@@ -81,9 +81,6 @@ Host psbuild-socks
 Host pscron
     ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
 
-# s3df data center
-Host s3df
-    HostName s3dflogin.slac.stanford.edu
 
 
 # Additional hosts from netconfig, hopping through psbuild-rhel7:

From 10a47edc078407f39f18fe7eb7ca0b19da9e6f04 Mon Sep 17 00:00:00 2001
From: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:01:42 -0700
Subject: [PATCH 3/4] MNT: ctrl-f missed

Co-authored-by: Zachary Lentz <ZLLentz@users.noreply.github.com>
---
 off_site/ssh/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/off_site/ssh/config b/off_site/ssh/config
index 73b3bae..e443854 100644
--- a/off_site/ssh/config
+++ b/off_site/ssh/config
@@ -37,7 +37,7 @@ Host psbuild
     # * The ${PS_JUMP_HOST} means we use that environment variable to specify
     #   which host to jump through.
     # * The ${PS_JUMP_HOST=...} syntax provides a default host to jump through,
-    #   which we set to "pslogin" here.
+    #   which we set to "s3dflogin" here.
     ProxyJump %r@${PS_JUMP_HOST=s3dflogin}
     # We can share local environment variables, if we choose:
     # SendEnv TMUX_SESSION_NAME

From bb952ebde44efe89099e195d35774e6c2ccc4a16 Mon Sep 17 00:00:00 2001
From: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:27:44 -0700
Subject: [PATCH 4/4] MNT: s3dflogin-arch

---
 off_site/ssh/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/off_site/ssh/config b/off_site/ssh/config
index e443854..ad47d43 100644
--- a/off_site/ssh/config
+++ b/off_site/ssh/config
@@ -13,8 +13,8 @@ Host s3dflogin
     # ControlMaster auto
     # ControlPath ~/.SSH-%r@%h:%p
 
-Host pslogin-arch
-    HostName pslogin.slac.stanford.edu
+Host s3dflogin-arch
+    HostName s3dflogin.slac.stanford.edu
     # Archiver management interface:
     # use http://localhost:17665/mgmt/ui/index.html
     LocalForward localhost:17665 pscaa02:17665