From: Vincent Le Gallic <legallic@crans.org>
Date: Sat, 8 Mar 2014 19:22:02 +0000 (+0100)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=2686338939da8197a2c6fdd7ef52070b18c9d11b;p=config-20-100.git

Merge branch 'master' into perso

Conflicts:
	.ssh/config
---

2686338939da8197a2c6fdd7ef52070b18c9d11b
diff --cc .ssh/config
index feae6d7,c2bb139..a74621c
--- a/.ssh/config
+++ b/.ssh/config
@@@ -268,22 -109,27 +268,27 @@@ Host cas auth login cas.crans.org login
  
  Host cas.adm cas.adm.crans.org
      HostName cas.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
 -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
 +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
      HostName charybde.crans.org
 -    User loginCr@ns
 +    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
 +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
      HostName charybde.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
+ Host civet.crans.org civet
+     HostName civet.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
  Host cochon.adm cochon.adm.crans.org
      HostName cochon.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host cochon.ferme cochon cochon.ferme.crans.org
@@@ -328,12 -174,22 +333,22 @@@ Host dyson.adm munin.adm dyson.adm.cran
  
  Host freebox freebox.crans.org
      HostName freebox.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
+ Host geet.crans.org git.crans.org geet git
+     HostName geet.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ Host geet.adm.crans.org git.adm.crans.org geet.adm git.adm
+     HostName geet.adm.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
  Host gordon gordon.crans.org
      HostName gordon.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host gordon.adm gordon.adm.crans.org
@@@ -748,9 -598,21 +763,21 @@@ Host eap.adm eap eap eap.adm.crans.or
      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
++    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 loginCr@ns
++    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 loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
      HostKeyAlgorithms ssh-rsa
@@@ -763,10 -625,9 +790,10 @@@ Host fy-ilo.adm fy-ilo fy-ilo fy-ilo.ad
      HostKeyAlgorithms ssh-rsa
  
  Host fy.adm fy fy fy.adm.crans.org
-     HostName fy.adm.crans.org
+     HostName fy.crans.org
 -    User loginCr@ns
 +    User legallic
      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
@@@ -776,10 -637,9 +803,10 @@@
      HostKeyAlgorithms ssh-rsa
  
  Host fz.adm fz fz fz.adm.crans.org
-     HostName fz.adm.crans.org
+     HostName fz.crans.org
 -    User loginCr@ns
 +    User legallic
      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