Merge branch 'master' into perso

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

diff --git a/.ssh/config b/.ssh/config
index 8bdf8a889357f3c36ee87054c205abbddfb3ec68..1b76a2d3759749391293893ea669b146e2e30deb 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -285,7 +285,7 @@ Host git git.crans.org
     User legallic
     ForwardAgent yes
 
-Host charybde.adm ftp.adm git.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.adm.crans.org mirror.adm.crans.org ntp.adm.crans.org git.adm.crans.org
+Host charybde.adm ftp.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.adm.crans.org mirror.adm.crans.org ntp.adm.crans.org
     HostName charybde.adm.crans.org
     User legallic
     ForwardAgent yes
@@ -340,6 +340,11 @@ Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host ethercalc ethercalc.crans.org
+    HostName ethercalc.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host freebox freebox.crans.org
     HostName freebox.crans.org
     User legallic
@@ -642,7 +647,7 @@ Host sogo.adm sogo.adm.crans.org
 
 Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
     HostName soyoustart.crans.org
-    HostName legallic
+    User legallic
     ForwardAgent yes
 
 Host ssh2 ssh2.crans.org
@@ -971,7 +976,7 @@ Host sas sas.eleves.ens.fr
 # +------------------+
 # Machines du département informatique de l'ENSC
 
-Host dptinfo21.dptinfo.ens-cachan.fr info21 infossh ssh.dptinfo
+Host dptinfo21.dptinfo.ens-cachan.fr info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
     #HostName 138.231.36.60
     HostName ssh.dptinfo.ens-cachan.fr
     User vlegalli