Merge branch 'master' into perso

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

diff --git a/.ssh/config b/.ssh/config
index 7ee9b62ef8f4c480a2137cb69d5de7efdfc13e8e..ff709e3a403f126efcdcb76bd94177d6b9076a5d 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -275,12 +275,17 @@ Host cas.adm cas.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host charybde darcs ftp ftp.crans.ens-cachan.fr git karibe mirror ntp xn--hxamgu1bpkn charybde.crans.org karibe.crans.org xn--hxamgu1bpkn.crans.org ftp.crans.org mirror.crans.org ftp.crans.ens-cachan.fr ntp.crans.org git.crans.org darcs.crans.org
+Host charybde darcs ftp ftp.crans.ens-cachan.fr karibe mirror ntp xn--hxamgu1bpkn charybde.crans.org karibe.crans.org xn--hxamgu1bpkn.crans.org ftp.crans.org mirror.crans.org ftp.crans.ens-cachan.fr ntp.crans.org darcs.crans.org
     HostName charybde.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 git git.crans.org
+    HostName geet.crans.org
+    User legallic
+    ForwardAgent yes
+
+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
@@ -335,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 legallic
+    ForwardAgent yes
+
 Host freebox freebox.crans.org
     HostName freebox.crans.org
     User legallic
@@ -637,7 +647,7 @@ Host sogo.adm sogo.adm.crans.org
 
 Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
     HostName soyoustart.crans.org
-    HostName loginCr@ns
+    User legallic
     ForwardAgent yes
 
 Host ssh2 ssh2.crans.org
@@ -966,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