From f005bae9e6a259996f3d542eb35422b141c82877 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 2 Jun 2018 21:18:26 -0700 Subject: [PATCH] Move SSH config to include-based. --- dotfiles/ssh/config | 35 ++++++++++++++-------------- private_dotfiles/ssh/config | Bin 1838 -> 0 bytes private_dotfiles/ssh/config.d/hosts | Bin 0 -> 1486 bytes 3 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 private_dotfiles/ssh/config create mode 100644 private_dotfiles/ssh/config.d/hosts diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config index abfcbf4..78ad1ff 100644 --- a/dotfiles/ssh/config +++ b/dotfiles/ssh/config @@ -1,22 +1,21 @@ -# Universal Settings (can't override) -# Never fall back to protocol 1: it's broken +# Universal Settings Protocol 2 +Include ~/.ssh/config.d/* + # Defaults (May be Overridden) +Host *.* + CheckHostIP yes + Host * - ControlMaster auto - ControlPath ~/.ssh/master/%r@%h:%p - ControlPersist yes - ForwardAgent no - ForwardX11 no - ForwardX11Trusted no - ServerAliveInterval 120 - CheckHostIP no - -Host warzone - Hostname warzone.shadowcats.club - Port 22 - User matir - -Host github.com - Hostname ssh.github.com + CheckHostIP no + ControlMaster auto + ControlPath ~/.ssh/master/%r@%h:%p + ControlPersist yes + ForwardAgent no + ForwardX11 no + ForwardX11Trusted no + ServerAliveInterval 120 + UpdateHostKeys yes + User david + VerifyHostKeyDNS yes diff --git a/private_dotfiles/ssh/config b/private_dotfiles/ssh/config deleted file mode 100644 index bc54d475b7abdda8b2aa7979b980c0f12a697656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1838 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