Add controlpersist, xeimaizi, handling of varnish-software.com

git-svn-id: file:///svn/tfheen/trunk/dotfiles@1521 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/ssh/config b/ssh/config
index 520a6b56a5dc4db2dd02b24d0a6d7c7e0b0d6184..c2f7ac6e7139c796763cd7150856de9e8a48ead4 100644 (file)
--- a/ssh/config
+++ b/ssh/config
@@ -1,13 +1,15 @@
 Host *
+#LogLevel DEBUG
 HashKnownHosts no
 TCPKeepAlive yes
 ServerAliveInterval 180
 GSSAPIAuthentication yes
 NoHostAuthenticationForLocalhost yes
-PreferredAuthentications "gssapi-with-mic, gssapi-keyex, publickey, hostbased, keyboard-interactive, password"
+PreferredAuthentications "gssapi-with-mic,gssapi-keyex,publickey,hostbased,keyboard-interactive,password"
 VerifyHostKeyDNS yes
 ControlMaster auto
 ControlPath ~/.ssh/cm_socket/%r@%h:%p
+ControlPersist 60
 
 Host 192.33.33.130
     User root
@@ -29,7 +31,7 @@ ProxyCommand none
 #Host *
 #ProxyCommand ssh -q -a -x fwlogin 'nc %h %p'
 #Host *
-#ProxyCommand ssh -q -a -x -p 80 -o 'ProxyCommand none' 129.241.56.185 'nc %h %p'
+#ProxyCommand ssh -q -a -x -p 22 -o 'ProxyCommand none' root@194.31.39.1 'nc %h %p'
 
 Host *.vpn.err.no
 ProxyCommand ssh -q -a -x vuizook.err.no 'nc -q0 %h %p'
@@ -89,5 +91,12 @@ Hostname gluck.debian.org
 Host master
 Hostname master.debian.org
 
+Host stardust.varnish-software.com graveyard.varnish-software.com cinnamon.varnish-software.com
+     User root
+
 Host *.varnish-software.com
-User tfheenR
\ No newline at end of file
+     User tfheenR
+     AddressFamily inet
+
+Host xeimaizi.err.no xeimaizi
+Hostname xeimaizi.err.no