Update ssh config

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

diff --git a/ssh/config b/ssh/config
index d8bdb219c20e3d5ecf33eef17efd6f1f35f65298..04173e4043646c57a48441aeadc626e53b6794ce 100644 (file)
--- a/ssh/config
+++ b/ssh/config
@@ -1,9 +1,13 @@
 Host *
 HashKnownHosts no
 TCPKeepAlive yes
-ServerAliveInterval 60
+ServerAliveInterval 180
 GSSAPIAuthentication yes
 NoHostAuthenticationForLocalhost yes
+PreferredAuthentications "publickey, hostbased, gssapi-with-mic, gssapi-keyex, keyboard-interactive, password"
+VerifyHostKeyDNS yes
+ControlMaster auto
+ControlPath ~/.ssh/cm_socket/%r@%h:%p
 
 Host 192.33.33.130
     User root
@@ -12,58 +16,29 @@ Host 192.33.33.130
 Host 10.10.36.30
     User root
 
+# ssh login1%host1:port1+login2%host2:port2+host3:port3 -l login3
 Host *+*
-ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') nc -w1 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /')
+ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') nc -q0 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /')
 
 # Fattigmanns vpn
-#Host tellus
-#Hostname tellus.err.no
-#Port 80
-#ProxyCommand none
+Host fwlogin
+Hostname fwlogin.pvv.org
+Port 443
+ProxyCommand none
 
 #Host *
-#ProxyCommand ssh -q -a -x tellus 'nc %h %p'
+#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'
 
-Host speed
-User root
-ProxyCommand ssh -q -a -x login.linpro.no -o 'ProxyCommand none' 'nc -q0 137.217.188.221 %p'
-
-Host lucetta
-User root
-ProxyCommand ssh -q -a -x login.linpro.no -o 'ProxyCommand none' 'nc -q0 137.217.188.222 %p'
-
-Host talbot
-User root
-ProxyCommand ssh -q -a -x login.linpro.no -o 'ProxyCommand none' 'nc -q0 137.217.188.121 %p'
-
-Host *.linpro.no
-ProxyCommand ssh -q -a -x login.linpro.no -o 'ProxyCommand none' 'nc -q0 %h %p'
-
-Host *.redpill-linpro.com
-ProxyCommand ssh -q -a -x login.redpill-linpro.com -o 'ProxyCommand none' 'nc -q0 %h %p'
-
 Host *.vpn.err.no
 ProxyCommand ssh -q -a -x vuizook.err.no 'nc -q0 %h %p'
 
-Host telekombckdd04
-User root
-ProxyCommand ssh -q -a -x 195.69.13.132 'nc 10.176.243.101 %p'
-
-Host 195.69.13.132
-User root
-ProxyCommand ssh -q -a -x false.linpro.no 'nc %h %p'
-
-
 # PVV
 
 Host bacchus
 Hostname bacchus.pvv.org
 
-Host proto
-Hostname proto.pvv.org
-
 Host echelon
 Hostname echelon.pvv.ntnu.no
 User root
@@ -77,11 +52,6 @@ Hostname cirkus.samfundet.no
 Host cassarossa
 Hostname cassarossa.samfundet.no
 
-# Linpro
-
-Host varnish*.linpro.no
-User root
-
 # Private / misc
 
 Host developer
@@ -100,14 +70,6 @@ GSSAPIDelegateCredentials yes
 Host *.err.no
 GSSAPIDelegateCredentials yes
 
-Host vawad
-Hostname vawad.err.no
-GSSAPIDelegateCredentials yes
-
-Host vawad-xen1
-Hostname vawad-xen1.err.no
-GSSAPIDelegateCredentials yes
-
 Host qwaeng
 Hostname qwaeng.err.no
 
@@ -115,38 +77,9 @@ Host aine aine.err.no
 Hostname aine.err.no
 GSSAPIDelegateCredentials yes
 
-Host vuizook
+Host vuizook vuizook.err.no
 Hostname vuizook.err.no
-#GSSAPIDelegateCredentials yes
-
-# Hardware.no
-
-Host delta
-Hostname delta.hardware.no
-
-Host epsilon
-Hostname epsilon.hardware.no
-
-Host zeta
-Hostname zeta.hardware.no
-
-Host eta
-Hostname eta.hardware.no
-
-Host iota
-Hostname iota.hardware.no
-
-Host theta
-Hostname theta.hardware.no
-
-Host kappa
-Hostname kappa.hardware.no
-
-Host sigma
-Hostname sigma.hardware.no
-
-Host omega
-Hostname omega.hardware.no
+AddressFamily inet
 
 # Debian
 
@@ -155,3 +88,6 @@ Hostname gluck.debian.org
 
 Host master
 Hostname master.debian.org
+
+Host *.varnish-software.com
+User tfheenR
\ No newline at end of file