From eca2f0961f023792e0809bfe0ee1d38e717814b0 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Jul 28 2023 16:21:33 +0000 Subject: [PATCH 1/2] sshaccess: add 10.3.171.* to Host list for ProxyCommand config I happen to have a server behind the 10.3.171.* range. I'm hoping we can add it to this line so I don't have to carry custom config for it. --- diff --git a/modules/sysadmin_guide/pages/sshaccess.adoc b/modules/sysadmin_guide/pages/sshaccess.adoc index 070dc46..5c4b64c 100644 --- a/modules/sysadmin_guide/pages/sshaccess.adoc +++ b/modules/sysadmin_guide/pages/sshaccess.adoc @@ -65,7 +65,7 @@ Host bastion.fedoraproject.org User FAS_USERNAME (all lowercase) ProxyCommand none ForwardAgent no -Host *.iad2.fedoraproject.org *.qa.fedoraproject.org 10.3.160.* 10.3.161.* 10.3.163.* 10.3.165.* 10.3.167.* *.vpn.fedoraproject.org batcave01 +Host *.iad2.fedoraproject.org *.qa.fedoraproject.org 10.3.160.* 10.3.161.* 10.3.163.* 10.3.165.* 10.3.167.* 10.3.171.* *.vpn.fedoraproject.org batcave01 ProxyCommand ssh -W %h:%p bastion.fedoraproject.org .... From 5b7e5834a990676856d87f2913a9d85f992d9b7b Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Jul 28 2023 16:28:30 +0000 Subject: [PATCH 2/2] sshaccess: provide separate config for batcave01 This has the benefit of making `ssh user@batcave01` get resolved to batcave01.iad2.fedoraproject.org which will make the known_hosts @cert-authority *.iad2.fedoraproject.org configuration apply. --- diff --git a/modules/sysadmin_guide/pages/sshaccess.adoc b/modules/sysadmin_guide/pages/sshaccess.adoc index 5c4b64c..9a0dd34 100644 --- a/modules/sysadmin_guide/pages/sshaccess.adoc +++ b/modules/sysadmin_guide/pages/sshaccess.adoc @@ -65,8 +65,10 @@ Host bastion.fedoraproject.org User FAS_USERNAME (all lowercase) ProxyCommand none ForwardAgent no -Host *.iad2.fedoraproject.org *.qa.fedoraproject.org 10.3.160.* 10.3.161.* 10.3.163.* 10.3.165.* 10.3.167.* 10.3.171.* *.vpn.fedoraproject.org batcave01 +Host *.iad2.fedoraproject.org *.qa.fedoraproject.org 10.3.160.* 10.3.161.* 10.3.163.* 10.3.165.* 10.3.167.* 10.3.171.* *.vpn.fedoraproject.org ProxyCommand ssh -W %h:%p bastion.fedoraproject.org +Host batcave01 + HostName %h.iad2.fedoraproject.org .... Note that there are 2 bastion servers: bastion01.fedoraproject.org