diff options
Diffstat (limited to 'ssh')
| -rw-r--r-- | ssh/config-pers | 10 | ||||
| -rw-r--r-- | ssh/config-wmf | 14 |
2 files changed, 21 insertions, 3 deletions
diff --git a/ssh/config-pers b/ssh/config-pers index d207323..36624d4 100644 --- a/ssh/config-pers +++ b/ssh/config-pers @@ -6,7 +6,13 @@ Host pergamum User liw-e4 IdentityFile ~/.ssh/pergamum.key -# Random individucal hosts. These are not tested by Subplot. +# My home network from the outside. + +Host ext-valkama + Hostname 62.78.212.250 + User ansible + +# Random individual hosts. These are not tested by Subplot. Host liwphone Hostname 10.0.0.161 @@ -34,7 +40,7 @@ Host remy Hostname 10.0.0.79 Host atuin.liw.fi - ProxyJump pieni.net +# ProxyJump pieni.net UserKnownHostsFile /dev/null StrictHostKeyChecking no 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 |