update e/gentoo proxy stuff

diff --git a/.ssh/config b/.ssh/config
index d3de6f5ed118b9128c8ef88c9cc5450769f68c3a..f120914c3590f24975f9f221b010c73e2089f3c6 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -115,18 +115,33 @@ Host sourceware.org
 Host uclibc.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
+Host e? e?.enlightenment.org e?v*.enlightenment.org
+       User vapier
+       ProxyCommand none
+
+Host git.enlightenment.org
+       User git
+       ProxyCommand none
+
+Host *.enlightenment.org
+       User vapier
+       ProxyCommand ssh -q e5v1.enlightenment.org -W %h:%p
+
 ###
 ### Gentoo systems
 ###
 
 # then at runtime, do:
-# ssh -M -N -f vapier@cvs.gentoo.org
-Host cvs.gentoo.org
-       ControlMaster auto
-       ControlPath ~/.ssh/master-%r@%h:%p
-# svn.gentoo.org
+# ssh -N -f -n master-cvs.gentoo.org
+Host master-cvs.gentoo.org
+       HostName cvs.gentoo.org
+       User vapier
+       ControlMaster yes
+       ControlPath ~/.ssh/master-%l-%r@%h:%p
 Host cvs.gentoo.org
-       ProxyCommand ssh -a vapier@dev.gentoo.org /usr/bin/nc -q2 %h %p
+       ControlMaster no
+       ControlPath ~/.ssh/master-%l-%r@%h:%p
+       BatchMode yes
 
 Host dev
        HostName dev.gentoo.org