diff options
| author | Lars Wirzenius <liw@liw.fi> | 2020-09-08 11:51:07 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2020-09-08 11:51:07 +0300 |
| commit | d252825cf7681880edd69b21a9f9a2b80895b07f (patch) | |
| tree | c88fb4ecbba58e01a248fa261606fa60ccc7d4fb /ssh/config-wmf | |
| parent | 304d9e6c19df6e78b53b896a710f5f801a988222 (diff) | |
| parent | d5ff7cef6eb7a90ca560e91deed3f456372bfd85 (diff) | |
| download | liw-dot-files-d252825cf7681880edd69b21a9f9a2b80895b07f.tar.gz | |
Merge branch 'master' of ssh://git.liw.fi/liw-dot-files
Diffstat (limited to 'ssh/config-wmf')
| -rw-r--r-- | ssh/config-wmf | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ssh/config-wmf b/ssh/config-wmf index 7778d15..3a253c0 100644 --- a/ssh/config-wmf +++ b/ssh/config-wmf @@ -4,7 +4,7 @@ CanonicalizeHostname yes # Defaults for all WMF hosts. -Match host=*.wikimedia.org,*.wmnet +Match host=*.wikimedia.org,*.wmnet,*.wmflabs,*.wmflabs.org ForwardAgent no IdentitiesOnly yes KbdInteractiveAuthentication no @@ -18,11 +18,23 @@ Host bast HostName bast3004.wikimedia.org IdentityFile ~/.ssh/prod.key +# Other bastion hosts. +Host bast*.wikimedia.org + IdentityFile ~/.ssh/prod.key + +Host labsbast + HostName primary.bastion.wmflabs.org + IdentityFile ~/.ssh/lab.key + # Proxy all connections to internal servers through the bastion host Host *.wmnet *.wikimedia.org !gerrit.wikimedia.org !bast*.wikimedia.org ProxyJump bast IdentityFile ~/.ssh/prod.key +Host *.wmflabs + ProxyJump labsbast + IdentityFile ~/.ssh/lab.key + Host gerrit.wikimedia.org Port 29418 IdentityFile ~/.ssh/lab.key |