Gitiles

gerrit.wikimedia.org / operations / debs / wmf-sre-laptop / cc95e04a300b51d3a7359835da25d517d029a500^! / .

Update SSH default config for new bastions running on Ganeti Change-Id: I0083495fe00f8b365fb2b7786e3bbda706f9afab

diff --git a/configs/ssh-client-config b/configs/ssh-client-config index b385b0d..6270f32 100644 --- a/configs/ssh-client-config +++ b/configs/ssh-client-config

@@ -1,5 +1,5 @@ ## Production & External Zones-Host bast1002.wikimedia.org bast2002.wikimedia.org bast3004.wikimedia.org bast4002.wikimedia.org bast5001.wikimedia.org restricted.bastion.wmflabs.org​+Host bast1002.wikimedia.org bast2002.wikimedia.org bast3005.wikimedia.org bast4003.wikimedia.org bast5002.wikimedia.org restricted.bastion.wmflabs.org StrictHostKeyChecking yes ProxyCommand none ControlMaster auto@@ -36,13 +36,13 @@ ProxyCommand ssh -a -W %h:%p bast2002.wikimedia.org Host *.esams.wmnet- ProxyCommand ssh -a -W %h:%p bast3004.wikimedia.org+ ProxyCommand ssh -a -W %h:%p bast3005.wikimedia.org Host *.ulsfo.wmnet- ProxyCommand ssh -a -W %h:%p bast4002.wikimedia.org+ ProxyCommand ssh -a -W %h:%p bast4003.wikimedia.org Host *.eqsin.wmnet- ProxyCommand ssh -a -W %h:%p bast5001.wikimedia.org+ ProxyCommand ssh -a -W %h:%p bast5002.wikimedia.org ## Networking Equipment Host *-eqiad.wikimedia.org *-eqord.wikimedia.org@@ -52,13 +52,13 @@ ProxyCommand ssh -a -W %h:%p bast2002.wikimedia.org Host *-esams.wikimedia.org *-knams.wikimedia.org- ProxyCommand ssh -a -W %h:%p bast3004.wikimedia.org+ ProxyCommand ssh -a -W %h:%p bast3005.wikimedia.org Host *-ulsfo.wikimedia.org- ProxyCommand ssh -a -W %h:%p bast4002.wikimedia.org+ ProxyCommand ssh -a -W %h:%p bast4003.wikimedia.org Host *-eqsin.wikimedia.org- ProxyCommand ssh -a -W %h:%p bast5001.wikimedia.org+ ProxyCommand ssh -a -W %h:%p bast5003.wikimedia.org ## Gerrit and Cloud VPS # See https://wikitech.wikimedia.org/wiki/Managing_multiple_SSH_agents#Using_multiple_agents_via_systemd for setting up multiple agents using systemd