X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=blobdiff_plain;f=.ssh%2Fconfig;h=439617c95949cca2ae71fc9cb6bfda1aa68f26a8;hp=271af7a2d3bab96f0dfcdb1cba12dd200ccc3e2c;hb=3110179d496d7675dccb8e477016607370e72521;hpb=0a492655b7e30ab9949bbfe0d76955fa125eecba

diff --git a/.ssh/config b/.ssh/config
index 271af7a..439617c 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -49,12 +49,17 @@ ServerAliveCountMax 3
 # 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 zeldren.crans.org zeldren
+    HostName zeldren.crans.org
+    User vincent
+    ForwardAgent yes
+
 Host cerebro.crans.org cerebro
     HostName cerebro.crans.org
     User vincent
@@ -263,6 +268,7 @@ Host sauron sauron.crans.org
 Host med zavoyarde med.crans.org zavoyarde.crans.org
     HostName zavoyarde.crans.org
     User vincent
+    ForwardAgent yes
 
 
 # +-------------------+
@@ -973,29 +979,38 @@ Host zbee.adm fx.adm nfs.adm zbee zbee zbee.adm.crans.org nfs.adm.crans.org fx.a
 # +---------+
 # Accessibles aux membres de l'équipe d'admin de FedeRez
 
-# Actuellement down, mais on ne sait jamais
-Host nautilus nautilus.federez.net
-    HostName nautilus.federez.net
+Host hexagon hexagon.federez.net
+    HostName hexagon.federez.net
     User legallic
     ForwardAgent yes
 
-Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
-    HostName baldrick.federez.net
+Host quigon quigon.federez.net
+    HostName quigon.federez.net
     User legallic
     ForwardAgent yes
 
-Host quigon quigon.federez.net
-    HostName quigon.federez.net
+Host nonagon nonagon.federez.net
+    HostName nonagon.federez.net
     User legallic
     ForwardAgent yes
 
-Host polygon polygon.federez.net
-    HostName polygon.federez.net
+Host octogon octogon.federez.net
+    HostName octogon.federez.net
     User legallic
     ForwardAgent yes
 
-Host hexagon hexagon.federez.net
-    HostName hexagon.federez.net
+Host pentagon pentagon.federez.net
+    HostName pentagon.federez.net
+    User legallic
+    ForwardAgent yes
+
+Host parangon parangon.federez.net
+    HostName parangon.federez.net
+    User legallic
+    ForwardAgent yes
+
+Host federez-test federez-test.federez.net
+    HostName federez-test.federez.net
     User legallic
     ForwardAgent yes
 
@@ -1008,7 +1023,7 @@ Host hexagon hexagon.federez.net
 Host oswaft oswaft.rezosup.net
     HostName oswaft.rezosup.net
     User vincent
-
+    ForwardAgent yes
 
 # +-------------------+
 # | Serveurs de l'ENS |
@@ -1066,35 +1081,5 @@ Host mars mars.lbpa mars.lbpa.ens-cachan.fr
     User vincent
     ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
 
-
-# +------+
-# | Labo |
-# +------+
-
-# Homes montées mais != passerelle
-Host lri acces.lri ssh.lri acces.lri.fr
-    HostName acces.lri.fr
-    User legallic
-    ForwardAgent yes
-
-# Passerelle d'entrée, utilisable que par clé
-Host pl-ssh pl-ssh.lri.fr
-    HostName pl-ssh.lri.fr
-    PasswordAuthentication no
-    User legallic
-    ForwardAgent yes
-
-Host labo lri30-13 lri30-13.lri.fr
-    HostName lri30-13.lri.fr
-    User legallic
-    ForwardAgent yes
-    ProxyCommand ssh pl-ssh.lri.fr -W %h:%p
-
-Host hal hal.labo 129.175.30.228
-    HostName 129.175.30.228
-    User vincent
-    ForwardAgent yes
-    ProxyCommand ssh pl-ssh.lri.fr -W %h:%p
-
 # END (utile pour éviter les merge conflicts)