# then at runtime, do:
# ssh -M -N -f vapier@cvs.gentoo.org
-#Host cvs.gentoo.org
-# ControlMaster auto
-# ControlPath ~/.ssh/master-%r@%h:%p
-#Host cvs.gentoo.org svn.gentoo.org
-# ProxyCommand ssh -a vapier@dev.gentoo.org /usr/bin/nc -q2 %h %p
+Host cvs.gentoo.org
+ ControlMaster auto
+ ControlPath ~/.ssh/master-%r@%h:%p
+Host cvs.gentoo.org svn.gentoo.org
+ ProxyCommand ssh -a vapier@dev.gentoo.org /usr/bin/nc -q2 %h %p
Host dev
HostName dev.gentoo.org
Host beluga
HostName beluga.ia64.dev.gentoo.org
IdentityFile ~/.ssh/id_rsa.vapier
-Host ia64
- HostName i2.gentoo.osuosl.org
+Host ia64 guppy
+ HostName guppy.ia64.dev.gentoo.org
IdentityFile ~/.ssh/id_rsa.vapier
### M68K ###