From: Vincent Le Gallic Date: Mon, 31 Mar 2014 16:55:52 +0000 (+0200) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=51358be024ad7bddb357cfa93a73acc1648e5c59;p=config-20-100.git Merge branch 'master' into perso Conflicts: .ssh/config --- 51358be024ad7bddb357cfa93a73acc1648e5c59 diff --cc .ssh/config index e739518,1d357b2..ff709e3 --- a/.ssh/config +++ b/.ssh/config @@@ -337,12 -169,17 +337,17 @@@ Host dyson munin nagios dyson.crans.or Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org HostName dyson.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host ethercalc ethercalc.crans.org + HostName ethercalc.crans.org + User legallic + ForwardAgent yes + 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 @@@ -934,69 -758,33 +939,69 @@@ 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 dptinfo21.dptinfo.ens-cachan.fr 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*.dptinfo.ens-cachan.fr -#~# HostName %h -#~# User loginENS -#~# ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p -#~# ForwardAgent yes -#~# -#~# Host info* -#~# HostName dpt%h.dptinfo.ens-cachan.fr -#~# User loginENS -#~# ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p -#~# ForwardAgent yes + User vlegalli + + +# +-----+ +# | Ulm | +# +-----+ +# Parce que je me suis inscrit à la DSI d'Ulm + +Host clipper clipper.ens.fr + HostName clipper.ens.fr + User legallic + +Host anat anat.ens.fr + HostName anat.ens.fr + User legallic + ForwardAgent yes + +Host horus horus.ens.fr + HostName horus.ens.fr + User legallic + ProxyCommand ssh legallic@anat.ens.fr -W %h:%p + +Host neith neith.ens.fr + HostName neith.ens.fr + User legallic + ProxyCommand ssh legallic@anat.ens.fr -W %h:%p + +Host sas sas.eleves.ens.fr + HostName sas.eleves.ens.fr + User legallic + + +# +------------------+ +# | Département info | +# +------------------+ +# Machines du département informatique de l'ENSC + - Host dptinfo21.dptinfo.ens-cachan.fr info21 infossh ssh.dptinfo ++Host dptinfo21.dptinfo.ens-cachan.fr 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*.dptinfo.ens-cachan.fr + HostName %h + User vlegalli + ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p + ForwardAgent yes + +Host info* + HostName dpt%h.dptinfo.ens-cachan.fr + User vlegalli + ProxyCommand ssh vlegalli@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 # END (utile pour éviter les merge conflicts)