From: Vincent Le Gallic <legallic@crans.org>
Date: Sat, 8 Mar 2014 19:39:30 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=ac79bb2f47a96158ec7d00e18acf6c938f2ab5b3;p=config-20-100.git

Merge branch 'master' into perso
---

ac79bb2f47a96158ec7d00e18acf6c938f2ab5b3
diff --cc .ssh/config
index 64b664a,8e096a2..7ee9b62
--- a/.ssh/config
+++ b/.ssh/config
@@@ -632,9 -469,14 +632,14 @@@ Host sogo sogo.crans.or
  
  Host sogo.adm sogo.adm.crans.org
      HostName sogo.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
+ Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
+     HostName soyoustart.crans.org
+     HostName loginCr@ns
+     ForwardAgent yes
+ 
  Host ssh2 ssh2.crans.org
      # Un serveur ssh qui n'est qu'un nat vers 138.231.136.1:22
      # pour passer à travers les blocages de ports (443 = https)