From: Vincent Le Gallic <legallic@crans.org>
Date: Wed, 5 Apr 2017 14:40:52 +0000 (+0200)
Subject: Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers... 
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=1b20c1bd3eeb524ec05f349c6c8bf6f2ca40b728;hp=-c

Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso
---

1b20c1bd3eeb524ec05f349c6c8bf6f2ca40b728
diff --combined .ssh/config
index db9e943,2d03343..f465ad1
--- a/.ssh/config
+++ b/.ssh/config
@@@ -49,12 -49,27 +49,27 @@@ ServerAliveCountMax 
  # ProxyCommand = pour passer par un autre serveur intermédiaire
  #                (pour un serveur qui ne peut pas être contacté directement)
  
- UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_hosts_dptinfo
+ UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_hosts_dptinfo ~/.ssh/known_hosts_telecom_serveurs ~/.ssh/known_hosts_telecom_tp
  
  # +--------------+
  # | Mes machines |
  # +--------------+
  
+ Host zeldrenviatahinesviapimeys
+     HostName zeldren.crans.org
+     User vincent
+     ProxyCommand ssh tahinesviapimeys -W %h:%p
+ 
+ Host tahinesviapimeys
+     HostName tahines.ens-cachan.fr
+     User vlegalli
+     ProxyCommand ssh pimeys.fr -W %h:%p
+ 
+ Host zeldren.crans.org zeldren
+     HostName zeldren.crans.org
+     User vincent
+     ForwardAgent yes
+ 
  Host cerebro.crans.org cerebro
      HostName cerebro.crans.org
      User vincent
@@@ -87,8 -102,8 +102,8 @@@ Host evaw.home eva
      ForwardAgent yes
      ProxyCommand ssh home.b2moo.fr -W %h:%p
  
- Host cabal.crans.org cabal.crans
-     HostName cabal.crans.org
+ Host zeldren.crans.org cabal.crans zeldren
+     HostName zeldren.crans.org
      User vincent
      ForwardAgent yes
  
@@@ -106,7 -121,13 +121,13 @@@ Host cabal.home caba
      HostName 192.168.1.81
      User vincent
      ForwardAgent yes
-     ProxyCommand ssh home.b2moo.fr -W %h:%p
+     ProxyCommand ssh -4 home.b2moo.fr -W %h:%p
+ 
+ Host cabalviabox
+     HostName home.b2moo.fr
+     Port 2222
+     User vincent
+     ForwardAgent yes
  
  Host cabalw.home cabalw
      HostName 192.168.1.63
@@@ -744,6 -765,16 +765,6 @@@ Host sable.adm proxy.adm sable.adm.cran
      HostName sable.adm.crans.org
      User legallic
      ForwardAgent yes
 -
 -Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org
 -    HostName sogo.crans.org
 -    User legallic
 -    ForwardAgent yes
 -
 -Host sogo.adm sogo.adm.crans.org
 -    HostName sogo.adm.crans.org
 -    User legallic
 -    ForwardAgent yes
  
  Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
      HostName soyouz.crans.org
@@@ -1066,5 -1097,13 +1087,13 @@@ Host mars mars.lbpa mars.lbpa.ens-cacha
      User vincent
      ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
  
+ # +---------+
+ # | Télécom |
+ # +---------+
+ 
+ Host rabban rabban.enst.fr
+     HostName rabban.enst.fr
+     User legallic
+ 
  # END (utile pour éviter les merge conflicts)