Merge branch 'master' into perso

[config-20-100.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 271af7a2d3bab96f0dfcdb1cba12dd200ccc3e2c..425c67c24c55dfded2179b36140fc41554ca9be0 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -973,30 +973,39 @@ 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
-    User legallic
-    ForwardAgent yes
-
-Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
-    HostName baldrick.federez.net
-    User legallic
+Host hexagon hexagon.federez.net
+    HostName hexagon.federez.net
+    User loginFedeRez
     ForwardAgent yes
 
 Host quigon quigon.federez.net
     HostName quigon.federez.net
-    User legallic
+    User loginFedeRez
     ForwardAgent yes
 
-Host polygon polygon.federez.net
-    HostName polygon.federez.net
-    User legallic
+Host nonagon nonagon.federez.net
+    HostName nonagon.federez.net
+    User loginFedeRez
     ForwardAgent yes
 
-Host hexagon hexagon.federez.net
-    HostName hexagon.federez.net
-    User legallic
+Host octogon octogon.federez.net
+    HostName octogon.federez.net
+    User loginFedeRez
+    ForwardAgent yes
+
+Host pentagon pentagon.federez.net
+    HostName pentagon.federez.net
+    User loginFedeRez
+    ForwardAgent yes
+
+Host parangon parangon.federez.net
+    HostName parangon.federez.net
+    User loginFedeRez
+    ForwardAgent yes
+
+Host federez-test federez-test.federez.net
+    HostName federez-test.federez.net
+    User loginFedeRez
     ForwardAgent yes
 
 
@@ -1066,35 +1075,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)