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 | |
parent | 304d9e6c19df6e78b53b896a710f5f801a988222 (diff) | |
parent | d5ff7cef6eb7a90ca560e91deed3f456372bfd85 (diff) | |
download | liw-dot-files-d252825cf7681880edd69b21a9f9a2b80895b07f.tar.gz |
Merge branch 'master' of ssh://git.liw.fi/liw-dot-files
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | gitconfig-wmf | 2 | ||||
-rw-r--r-- | ssh/config-pers | 10 | ||||
-rw-r--r-- | ssh/config-wmf | 14 |
4 files changed, 26 insertions, 3 deletions
@@ -1,2 +1,5 @@ emacs.d/auto-save-list emacs.d/**/*.elc +emacs.d/session* +emacs.d/tramp +emacs.d/url diff --git a/gitconfig-wmf b/gitconfig-wmf index 15fa3c1..a6b6a19 100644 --- a/gitconfig-wmf +++ b/gitconfig-wmf @@ -18,3 +18,5 @@ [review] remote = origin username = liw +[protocol] + version = 2
\ No newline at end of file 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 |