Nouvelles machines

diff --git a/.ssh/config b/.ssh/config
index cee0f71bbe5f5fd92fce694ef092289b7f7ffdbc..c2bb1393e3a719167a5a15edc89eafdc26a47341 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -112,16 +112,21 @@ Host cas.adm cas.adm.crans.org
     User loginCr@ns
     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
     HostName charybde.crans.org
     User loginCr@ns
     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 loginCr@ns
     ForwardAgent yes
 
+Host civet.crans.org civet
+    HostName civet.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host cochon.adm cochon.adm.crans.org
     HostName cochon.adm.crans.org
     User loginCr@ns
@@ -172,6 +177,16 @@ Host freebox freebox.crans.org
     User loginCr@ns
     ForwardAgent yes
 
+Host geet.crans.org git.crans.org geet git
+    HostName geet.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host geet.adm.crans.org git.adm.crans.org geet.adm git.adm
+    HostName geet.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host gordon gordon.crans.org
     HostName gordon.crans.org
     User loginCr@ns
@@ -583,6 +598,18 @@ Host eap.adm eap eap eap.adm.crans.org
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
+Host ft-ilo.adm ft-ilo ft-ilo ft-ilo.adm.crans.org
+    HostName ft-ilo.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
+    HostKeyAlgorithms ssh-rsa
+
+Host ft.adm ft ft ft.adm.crans.org
+    HostName ft.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host fx-ilo.adm fx-ilo zamok-ilo.adm fx-ilo fx-ilo.adm.crans.org zamok-ilo.adm.crans.org
     HostName fx-ilo.adm.crans.org
     User loginCr@ns
@@ -598,10 +625,9 @@ Host fy-ilo.adm fy-ilo fy-ilo fy-ilo.adm.crans.org
     HostKeyAlgorithms ssh-rsa
 
 Host fy.adm fy fy fy.adm.crans.org
-    HostName fy.adm.crans.org
+    HostName fy.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
 Host fz-ilo.adm fz-ilo fz-ilo fz-ilo.adm.crans.org
     HostName fz-ilo.adm.crans.org
@@ -611,10 +637,9 @@ Host fz-ilo.adm fz-ilo fz-ilo fz-ilo.adm.crans.org
     HostKeyAlgorithms ssh-rsa
 
 Host fz.adm fz fz fz.adm.crans.org
-    HostName fz.adm.crans.org
+    HostName fz.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
 Host kdell-idrac.adm kdell-idrac kdell-idrac kdell-idrac.adm.crans.org
     HostName kdell-idrac.adm.crans.org