Merge branch 'master' into perso

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

diff --git a/.ssh/config b/.ssh/config
index feae6d78f2dd791e13d9aeccc5a8a2c5a01404b2..a74621ce81c9ce9e868a383f9af4ce8f1b686b50 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -281,6 +281,11 @@ Host charybde.adm ftp.adm git.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.
     User legallic
     ForwardAgent yes
 
+Host civet.crans.org civet
+    HostName civet.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host cochon.adm cochon.adm.crans.org
     HostName cochon.adm.crans.org
     User legallic
@@ -331,6 +336,16 @@ Host freebox freebox.crans.org
     User legallic
     ForwardAgent yes
 
+Host geet.crans.org git.crans.org geet git
+    HostName geet.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host geet.adm.crans.org git.adm.crans.org geet.adm git.adm
+    HostName geet.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host gordon gordon.crans.org
     HostName gordon.crans.org
     User legallic
@@ -748,6 +763,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 legallic
+    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 legallic
+    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 legallic
@@ -763,7 +790,7 @@ 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 legallic
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
@@ -776,7 +803,7 @@ 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 legallic
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p