- Use FQDN to distinguish between SSH hosts.

- Added gitolite_ops.fdna.com.

.ssh/config.d/20_fdna

@@ -15,22 +15,22 @@ HostName bitbucket.org
 User git
 IdentityFile ~/.ssh/fdna_rsa
 
-Host monster
+Host monster.fdna.local
 HostName 10.0.0.209
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
 
-Host backup
+Host backup.fdna.local
 HostName 10.0.0.210
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
 
-Host xen01
+Host xen01.fdna.local
 HostName 10.0.0.110
 User root
 IdentityFile ~/.ssh/fdna_rsa
 
-Host adm1
+Host adm1.fdna.local
 HostName 10.0.0.111
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
@@ -39,12 +39,12 @@ Host 10.0.0.20?
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
 
-Host storage
+Host storage.fdna.local
 HostName 10.0.0.220
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
 
-Host data-management
+Host data-management.fdna.local
 HostName 10.0.0.109
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
@@ -78,7 +78,6 @@ Host nag01.fdna.com
 HostName nag01.cloudapp.net
 User fdna_srv
 IdentityFile ~/.ssh/fdna_rsa
-ProxyCommand ssh ns1 nc %h %p
 
 Host dev2_ops
 HostName 52.213.235.92
@@ -104,3 +103,20 @@ Host ci_ops
 HostName 52.208.181.7
 User nimrod
 IdentityFile ~/.ssh/fdna_rsa
+
+Host *.dev-f2g.com
+User nimrod
+IdentityFile ~/.ssh/fdna_rsa
+
+Host *.face2gene.com
+User nimrod
+IdentityFile ~/.ssh/fdna_rsa
+
+Host *.fdna.com
+User nimrod
+IdentityFile ~/.ssh/fdna_rsa
+
+Host gitolite_ops
+HostName 52.211.215.151
+User nimrod
+IdentityFile ~/.ssh/fdna_rsa

.ssh/config.d/20_shore

 # shore.co.il infrastructure
 
-Host ns1 www.shore.co.il
+Host ns1.shore.co.il www.shore.co.il
 HostName ns1.shore.co.il
 LocalForward 9091 xbmc.trusted:9091
 DynamicForward 8080
@@ -8,46 +8,46 @@ User nimrod
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
 
-Host xbmc
+Host xbmc.shore.co.il
 HostName xbmc.trusted
 User nimrod
 ForwardX11 yes
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
-ProxyCommand ssh ns1 nc %h %p
+ProxyCommand ssh ns1.shore.co.il nc %h %p
 
-Host ns2
+Host ns2.shore.co.il
 HostName ns2.shore.co.il
 User admin
 DynamicForward 9999
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
 
-Host cgit
+Host cgit.shore.co.il
 HostName cgit.trusted
-ProxyCommand ssh ns1 nc %h %p
+ProxyCommand ssh ns1.shore.co.il nc %h %p
 User nimrod
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
 
-Host ns3
+Host ns3.shore.co.il
 HostName ns3.shore.co.il
 User root
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
 DynamicForward 8081
 
-Host host01
+Host host01.shore.co.il
 HostName host01.trusted
 User nimrod
-ProxyCommand ssh ns1 nc %h %p
+ProxyCommand ssh ns1.shore.co.il nc %h %p
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
 
-Host wdr4300
+Host wdr4300.shore.co.il
 HostName wdr4300.trusted
 User root
-ProxyCommand ssh ns1 nc %h %p
+ProxyCommand ssh ns1.shore.co.il nc %h %p
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rssa
 LocalForward 8082 localhost:80