From: Vincent Le Gallic Date: Thu, 12 Mar 2015 03:17:01 +0000 (+0100) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=74757c6b0aa14166601dc67bc497a75204cacff4;p=config-20-100.git Merge branch 'master' into perso Conflicts: .ssh/config --- 74757c6b0aa14166601dc67bc497a75204cacff4 diff --cc .ssh/config index 3e37672,bc032a6..194a059 --- a/.ssh/config +++ b/.ssh/config @@@ -285,12 -75,12 +285,12 @@@ Host alice.adm alice.adm.crans.or Host appartement hackpartement appartement.crans.org hackpartement.crans.org HostName appartement.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host apprentis apprentis.crans.org + Host apprentis munin-apprentis apprentis.crans.org munin-apprentis.crans.org HostName apprentis.crans.org - User loginCr@ns + User legallic Host asterisk sip stun voip asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org HostName asterisk.crans.org @@@ -358,12 -148,22 +358,22 @@@ Host cochon.adm cochon.adm.crans.or Host cochon.ferme cochon cochon television tv cochon.ferme.crans.org television.crans.org tv.crans.org cochon.crans.org HostName cochon.ferme.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host cups cups.crans.org + HostName cups.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host cups.adm cups.adm.crans.org + HostName cups.adm.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host dhcp dhcp.crans.org HostName dhcp.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host dhcp-21 dhcp-21.crans.org @@@ -403,17 -203,12 +413,12 @@@ Host freebox freebox.crans.or Host ft ft.crans.org HostName ft.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host ft-ilo ft-ilo.crans.org - HostName ft-ilo.crans.org - User legallic - ForwardAgent yes - Host ft.adm ft.adm.crans.org HostName ft.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host fy munin fy.crans.org munin.crans.org @@@ -438,12 -233,12 +443,12 @@@ Host fz.adm fz.adm.crans.or Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org HostName geet.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host geet.adm git.adm geet.adm.crans.org git.adm.crans.org + Host geet.adm git.adm gitlab.adm geet.adm.crans.org git.adm.crans.org gitlab.adm.crans.org HostName geet.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host horde webmail horde.crans.org webmail.crans.org @@@ -508,17 -303,12 +513,12 @@@ Host komaz-21 komaz-21.crans.or Host komaz.adm komaz.adm.crans.org HostName komaz.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host komaz.wifi komaz.wifi.crans.org - HostName komaz.wifi.crans.org - User legallic - ForwardAgent yes - Host malloc malloc.crans.org HostName malloc.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host malloc.adm malloc.adm.crans.org @@@ -563,12 -353,12 +563,12 @@@ Host news web-news webnews news.crans.o Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org web-news.adm.crans.org HostName news.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host niomniom 15ans autostatus ca crans.ens-cachan.fr crans.org doc i-p install-party map webalizer wifi wiki wikipedia www www.15ans niomniom.crans.org wiki.crans.org www.crans.org install-party.crans.org autostatus.crans.org wifi.crans.org i-p.crans.org crans.org crans.ens-cachan.fr ca.crans.org webalizer.crans.org doc.crans.org map.crans.org wikipedia.crans.org 15ans.crans.org www.15ans.crans.org + Host niomniom 15ans autoconfig autostatus ca crans.ens-cachan.fr crans.org doc i-p install-party map webalizer wifi wiki wikipedia www www.15ans niomniom.crans.org wiki.crans.org www.crans.org install-party.crans.org autostatus.crans.org wifi.crans.org i-p.crans.org crans.org crans.ens-cachan.fr ca.crans.org webalizer.crans.org doc.crans.org map.crans.org wikipedia.crans.org 15ans.crans.org www.15ans.crans.org autoconfig.crans.org HostName niomniom.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host niomniom.adm niomniom.adm.crans.org @@@ -593,32 -383,57 +593,57 @@@ Host odlyd odlyd.crans.or Host odlyd.adm upload.adm odlyd.adm.crans.org upload.adm.crans.org HostName odlyd.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host odlyd.wifi odlyd.wifi.crans.org + HostName odlyd.wifi.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host oie oie oie.ferme oie.crans.org oie.ferme.crans.org HostName oie.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host oie.adm oie.adm.crans.org HostName oie.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host omnomnom omnomnom.crans.org + HostName omnomnom.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host omnomnom.adm omnomnom.adm.crans.org + HostName omnomnom.adm.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host owl imap pop owl.crans.org pop.crans.org imap.crans.org HostName owl.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host owl.adm imap.adm pop.adm owl.adm.crans.org imap.adm.crans.org pop.adm.crans.org HostName owl.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host owncloud owncloud.crans.org + HostName owncloud.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host owncloud.adm owncloud.adm.crans.org + HostName owncloud.adm.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host pea pea.crans.org HostName pea.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host pea.adm pea.adm.crans.org @@@ -638,17 -453,17 +663,17 @@@ Host puppet puppet.crans.or Host puppet.adm puppet.adm.crans.org HostName puppet.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host redisdead lists smtp redisdead.crans.org lists.crans.org smtp.crans.org + Host redisdead list liste listes lists smtp redisdead.crans.org lists.crans.org smtp.crans.org liste.crans.org listes.crans.org list.crans.org HostName redisdead.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host redisdead.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org + Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org listes.adm.crans.org list.adm.crans.org liste.adm.crans.org HostName redisdead.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host rezosup rezosup.crans.org @@@ -708,10 -523,10 +733,10 @@@ Host soyouz soyoustart soyouz.crans.or Host soyouz.adm soyoustart.adm soyouz.adm.crans.org soyoustart.adm.crans.org HostName soyouz.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host ssh2 ssh2.crans.org + Host ssh2 mosh ssh2.crans.org mosh.crans.org # Un serveur ssh qui n'est qu'un nat vers 138.231.136.1:22 # pour passer à travers les blocages de ports (443 = https) HostName 138.231.136.2 @@@ -731,17 -546,17 +756,17 @@@ Host template template.crans.or Host template.adm template.adm.crans.org HostName template.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host thot psuornotpsu thot.crans.org psuornotpsu.crans.org + Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org HostName thot.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host thot.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org + Host thot.adm logs.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org logs.adm.crans.org HostName thot.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host titanic titanic.crans.org @@@ -796,12 -611,12 +821,12 @@@ Host ytrap-llatsni ytrap-llatsni.crans. Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org HostName ytrap-llatsni.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host zamok accounts ajaxterm bda-paris bde bleu blogs clubs clubs.ens-cachan.fr factures impression intranet mysql perso ssh www.clubs.ens-cachan.fr zamok.crans.org ssh.crans.org impression.crans.org perso.crans.org clubs.ens-cachan.fr www.clubs.ens-cachan.fr mysql.crans.org bleu.crans.org intranet.crans.org blogs.crans.org bda-paris.crans.org factures.crans.org accounts.crans.org ajaxterm.crans.org clubs.crans.org bde.crans.org + Host zamok accounts ajaxterm bda-paris bde bleu blogs clubs clubs.ens-cachan.fr factures impression intranet mysql perso pot-vieux ssh www.clubs.ens-cachan.fr zamok.crans.org ssh.crans.org impression.crans.org perso.crans.org clubs.ens-cachan.fr www.clubs.ens-cachan.fr mysql.crans.org bleu.crans.org intranet.crans.org blogs.crans.org bda-paris.crans.org factures.crans.org accounts.crans.org ajaxterm.crans.org clubs.crans.org bde.crans.org pot-vieux.crans.org HostName zamok.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host zamok.adm bleu.adm impression.adm users.adm zamok.adm.crans.org bleu.adm.crans.org impression.adm.crans.org users.adm.crans.org @@@ -834,9 -649,16 +859,16 @@@ 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 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 @@@ -962,70 -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*.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 + + +# +------------------+ +# | 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 ++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*.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 + ++ +# +------+ +# | 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)