[ssh] Rationalisation de (eva|cabal)w?(.local)?

diff --git a/.ssh/config b/.ssh/config
index 75c27b7acb10eec4020cb0bdec2cff6986d7a649..46c61ec34bd7bcae6b1b0546c13ada1274f45466 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -61,37 +61,56 @@ Host cerebro.crans.org cerebro
 Host eva.crans.org eva eeepc
     HostName eva.crans.org
     User vincent
-    ForwardX11 yes
     ForwardAgent yes
 
-Host evaw evaw.local
+Host eva.local
+    HostName 192.168.1.79
+    User vincent
+    ForwardAgent yes
+
+Host evaw.local
     HostName 192.168.1.29
     User vincent
     ForwardAgent yes
 
+Host eva.home evaf
+    HostName 192.168.1.79
+    User vincent
+    ForwardAgent yes
+    ProxyCommand ssh home.b2moo.fr -W %h:%p
+
+Host evaw.home evaw
+    HostName 192.168.1.29
+    User vincent
+    ForwardAgent yes
+    ProxyCommand ssh home.b2moo.fr -W %h:%p
+
 Host cabal.crans.org cabal.crans
     HostName cabal.crans.org
     User vincent
-    ForwardX11 yes
     ForwardAgent yes
 
 Host cabal.local
     HostName 192.168.1.81
     User vincent
-    ForwardX11 yes
     ForwardAgent yes
 
-Host cabal
+Host cabalw.local
+    HostName 192.168.1.63
+    User vincent
+    ForwardAgent yes
+
+Host cabal.home cabal
     HostName 192.168.1.81
     User vincent
-    ForwardX11 yes
     ForwardAgent yes
     ProxyCommand ssh home.b2moo.fr -W %h:%p
 
-Host cabalw cabalw.local
+Host cabalw.home cabalw
     HostName 192.168.1.63
     User vincent
     ForwardAgent yes
+    ProxyCommand ssh home.b2moo.fr -W %h:%p
 
 Host viki viki.wifi viki.wifi.crans.org
     HostName viki.wifi.crans.org