From f4b1128e6311602ded8a72d83e7a41242451baac Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 25 Mar 2020 20:22:06 +0200 Subject: Change: ssh/config-wmf for beta cluster accesss --- ssh/config-wmf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ssh/config-wmf b/ssh/config-wmf index 7778d15..b6f6613 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,19 @@ Host bast HostName bast3004.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 -- cgit v1.2.1 From 526cc96e6549277812bd573d30776aa9db974389 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 25 Mar 2020 20:41:03 +0200 Subject: Add: ext-valkam to ssh/config-persx --- ssh/config-pers | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ssh/config-pers b/ssh/config-pers index d207323..71bc021 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 -- cgit v1.2.1 From 3fbf555be928902610e1ab746106193edbf868a2 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 6 Jul 2020 13:55:38 +0300 Subject: perf: use git protocol 2 for WMF stuff --- gitconfig-wmf | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.1 From 896ef7c27b418ab1e389db13f92f941416edace9 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 7 Sep 2020 18:06:44 +0300 Subject: fix(ssh): Use prod key for all WMF bastion hosts --- ssh/config-wmf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ssh/config-wmf b/ssh/config-wmf index b6f6613..3a253c0 100644 --- a/ssh/config-wmf +++ b/ssh/config-wmf @@ -18,6 +18,10 @@ 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 -- cgit v1.2.1 From 61381da3147d732c4f154c6f5c112e62aabf07cc Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 7 Sep 2020 18:07:02 +0300 Subject: fix(ssh): don't use pieni.net as a jumphost for atuin There's not point. --- ssh/config-pers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssh/config-pers b/ssh/config-pers index 71bc021..36624d4 100644 --- a/ssh/config-pers +++ b/ssh/config-pers @@ -40,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 -- cgit v1.2.1 From d5ff7cef6eb7a90ca560e91deed3f456372bfd85 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 7 Sep 2020 18:08:22 +0300 Subject: fix: ignore more unshareable emacs temp files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 1730706..6ecd6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ emacs.d/auto-save-list emacs.d/**/*.elc +emacs.d/session* +emacs.d/tramp +emacs.d/url -- cgit v1.2.1