X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.ssh%2Fconfig;h=d586e96e9c0b5f7b7a3dc0051d7f6c771fb6707c;hb=ce95d0f5a983efeeba14cb8b66f811257efda601;hp=f003fb7e247bcb525ca23b51c1f8b4a97c514b99;hpb=1fc4f279ea6f818f13a8c3b64f90d24e24cda3d3;p=nethome.git

diff --git a/.ssh/config b/.ssh/config
index f003fb7..d586e96 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,14 +1,22 @@
+IdentityFile ~/.ssh/id_dsa
+IdentityFile ~/.ssh/id_rsa
+IdentityFile ~/.ssh/identity
+IdentityFile ~/.ssh/barstool-id_dsa
+
 Host localhost
 #Cipher none
 Compression no
 
 Host sebastian.redhat.com
+ControlMaster auto
+ControlPath /tmp/ssh-%h-%p-%r.sock
 # Required for: http://intranet.corp.redhat.com/ic/intranet/LWNReminder.html
 LocalForward 3228 squid.redhat.com:8080
 # Looks to be stucking:
 LocalForward 3328 squid.corp.redhat.com:3128
 LocalForward 3025 mail.stuttgart.redhat.com:25
-LocalForward 3993 pobox.stuttgart.redhat.com:993
+LocalForward 3993 pobox.devel.redhat.com:993
+LocalForward 3983 pobox.stuttgart.redhat.com:993
 LocalForward 6667 irc.devel.redhat.com:6667
 LocalForward 3389 ldap.stuttgart.redhat.com:389
 LocalForward 3046 curly.devel.redhat.com:4046
@@ -23,16 +31,17 @@ LocalForward 3235 engarchive.rdu.redhat.com:2049
 #LocalForward 3180 devserv.devel.redhat.com:3180
 ProxyCommand none
 StrictHostKeyChecking yes
-Host *.redhat.usu *.test.redhat.com *.lab.boston.redhat.com *.rhts.boston.redhat.com *.z900.redhat.com
+Host *.test.redhat.com *.lab.boston.redhat.com *.rhts.boston.redhat.com *.z900.redhat.com *.cambridge.redhat.com *.gsslab.rdu.redhat.com prdell.brq.redhat.com
 User root
-Host *.redhat.usu
-User jkratoch
+UserKnownHostsFile /dev/null
+Host cvs.fedora.redhat.com sources.redhat.com
+ProxyCommand none
+StrictHostKeyChecking yes
 Host *.redhat.com porkchop devserv barstool
 User jkratoch
 ProxyCommand ssh sebastian.redhat.com exec nc %h %p
 StrictHostKeyChecking no
-Host *.test.redhat.com *.lab.boston.redhat.com *.rhts.boston.redhat.com *.z900.redhat.com
-UserKnownHostsFile /dev/null
+NumberOfPasswordPrompts 6
 Host porkchop
 HostName porkchop.devel.redhat.com
 HostKeyAlias porkchop.devel.redhat.com
@@ -45,7 +54,6 @@ HostKeyAlias barstool.build.redhat.com
 
 Host hotelgate hotelgate.hotelsevendays.cz
 User root
-ForwardAgent yes
 Host hotelgate
 HostName hotelgate.hotelsevendays.cz
 HostKeyAlias hotelgate.hotelsevendays.cz
@@ -89,6 +97,6 @@ RhostsRSAAuthentication no
 ForwardX11 no
 ServerAliveInterval 60
 StrictHostKeyChecking ask
-ControlMaster auto
-ControlPath /tmp/ssh-%h-%p-%r.sock
+#ControlMaster auto
+#ControlPath /tmp/ssh-%h-%p-%r.sock
 GSSAPIAuthentication no