From: Vincent Le Gallic Date: Sat, 11 Apr 2015 14:44:18 +0000 (+0200) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=8d82e5abd09ae7b42c42f30d316a412c54bbcf7f;p=config-20-100.git Merge branch 'master' into perso Conflicts: .ssh/config --- 8d82e5abd09ae7b42c42f30d316a412c54bbcf7f diff --cc .ssh/config index ab52ddf,f34fb76..03a66ca --- a/.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)