From 9f8f12cad90d9d21548289d4f77699c9775d77f7 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 25 Jun 2017 11:39:55 +0300
Subject: [PATCH] - Finally read the ssh_config man page about which value is
 used, changed config accordingly.

---
 .ssh/config.d/15_ec2       |  5 -----
 .ssh/config.d/20_bullguard |  2 --
 .ssh/config.d/20_shore     | 28 ++++------------------------
 3 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 .ssh/config.d/15_ec2

diff --git a/.ssh/config.d/15_ec2 b/.ssh/config.d/15_ec2
deleted file mode 100644
index d23a1b5..0000000
--- a/.ssh/config.d/15_ec2
+++ /dev/null
@@ -1,5 +0,0 @@
-# Disable SSH host key checking for EC2 instances.
-
-Host  *.compute-1.amazonaws.com
-UserKnownHostsFile /dev/null
-StrictHostKeyChecking no
diff --git a/.ssh/config.d/20_bullguard b/.ssh/config.d/20_bullguard
index b967b50..7261284 100644
--- a/.ssh/config.d/20_bullguard
+++ b/.ssh/config.d/20_bullguard
@@ -6,11 +6,9 @@ User git
 IdentityFile ~/.ssh/bullguard_ecdsa
 
 Host 172.50.1.11
-IdentityFile ~/.ssh/bullguard-prod_rsa
 User ec2-user
 
 Host 172.50.1.111
-IdentityFile ~/.ssh/bullguard-prod_rsa
 User ec2-user
 
 Host 172.50.*.*
diff --git a/.ssh/config.d/20_shore b/.ssh/config.d/20_shore
index c7547e3..26791d7 100644
--- a/.ssh/config.d/20_shore
+++ b/.ssh/config.d/20_shore
@@ -1,53 +1,33 @@
 # shore.co.il infrastructure
 
 Host ns1.shore.co.il www.shore.co.il
-HostName ns1.shore.co.il
 LocalForward 9091 xbmc.shore.co.il:9091
 DynamicForward 8080
-User nimrod
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host xbmc.shore.co.il
-HostName xbmc.shore.co.il
-User nimrod
 ForwardX11 yes
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
 
 Host ns2.shore.co.il
-HostName ns2.shore.co.il
 User admin
 DynamicForward 9999
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host cgit.shore.co.il
-HostName cgit.shore.co.il
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
-User nimrod
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host ns3.shore.co.il
-HostName ns3.shore.co.il
 User root
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 DynamicForward 8081
 
 Host host01.shore.co.il
-HostName host01.shore.co.il
-User nimrod
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host wdr4300.shore.co.il
-HostName wdr4300.shore.co.il
 User root
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
+LocalForward 8082 localhost:80
+
+Host *.shore.co.il
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
-LocalForward 8082 localhost:80
+User nimrod
-- 
GitLab