Merge branch 'master' into perso

Conflicts:
	.ssh/config

diff --cc .ssh/config
index ab52ddfdcec44a5cdb3b41376709c69c23fb6b89,f34fb768e66c17683e12c26cda739dbbbbc36464..03a66cae94ee80af55104ef88caaf399003eaf60
--- 1/.ssh/config
--- 2/.ssh/config
+++ b/.ssh/config
@@@ -994,66 -779,33 +994,72 @@@ Host tselin
  
  Host tahines.ens-cachan.fr tahines2 tahines
      HostName tahines.ens-cachan.fr
 -    User loginENS
 -
 -
 -#~# # +------------------+
 -#~# # | Département info |
 -#~# # +------------------+
 -#~# # Machines du département informatique de l'ENSC
 -#~# # Accesibles aux A0
 -#~# 
 -#~# Host info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
 -#~#     #HostName 138.231.36.60
 -#~#     HostName ssh.dptinfo.ens-cachan.fr
 -#~#     User loginENS
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host *.dptinfo
 -#~#     HostName %h.ens-cachan.fr
 -#~#     User loginENS
 -#~#     ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host *.dptinfo.ens-cachan.fr
 -#~#     HostName %h
 -#~#     User loginENS
 -#~#     ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
 -#~#     ForwardAgent yes
 +    User vlegalli
 +
 +
 +# +------------------+
 +# | Département info |
 +# +------------------+
 +# Machines du département informatique de l'ENSC
 +# Accesibles aux A0
 +
 +Host info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
 +    #HostName 138.231.36.60
 +    HostName ssh.dptinfo.ens-cachan.fr
 +    User vlegalli
 +    ForwardAgent yes
 +
 +Host *.dptinfo
 +    HostName %h.ens-cachan.fr
 +    User vlegalli
 +    ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p
 +    ForwardAgent yes
 +
++Host *.dptinfo.ens-cachan.fr
++    HostName %h
++    User vlegalli
++    ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
++    ForwardAgent yes
+ 
  
 +# +--------+
 +# | Stages |
 +# +--------+
 +
 +Host mars mars.lbpa mars.lbpa.ens-cachan.fr
 +    HostName mars.lbpa.ens-cachan.fr
 +    User vincent
 +    ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
 +
 +
 +# +------+
 +# | Labo |
 +# +------+
 +
 +# Homes montées mais != passerelle
 +Host lri acces.lri ssh.lri acces.lri.fr
 +    HostName acces.lri.fr
 +    User legallic
 +    ForwardAgent yes
 +
 +# Passerelle d'entrée, utilisable que par clé
 +Host pl-ssh pl-ssh.lri.fr
 +    HostName pl-ssh.lri.fr
 +    PasswordAuthentication no
 +    User legallic
 +    ForwardAgent yes
 +
 +Host labo lri30-13 lri30-13.lri.fr
 +    HostName lri30-13.lri.fr
 +    User legallic
 +    ForwardAgent yes
 +    ProxyCommand ssh pl-ssh.lri.fr -W %h:%p
 +
 +Host hal hal.labo 129.175.29.151
 +    HostName 129.175.29.151
 +    User vincent
 +    ForwardAgent yes
 +    ProxyCommand ssh pl-ssh.lri.fr -W %h:%p
 +
  # END (utile pour éviter les merge conflicts)