Merge branch 'master' into perso

Conflicts:
	.ssh/config

Au passage j'ai viré les machines d'ulm

diff --cc .bashrc
Simple merge

diff --cc .ssh/config
index 8ffe797428d9387663edf33c03e2ced71d5a8844,3f12b621c18927ce2dd6f59886630c89245781d1..4ca4613182b565ceaba365b9a30af2a146a00e84
--- 1/.ssh/config
--- 2/.ssh/config
+++ b/.ssh/config
@@@ -275,18 -63,28 +275,28 @@@ Host acoeur acoeur.crans.or
  # Accessible aux apprentis
  # sauf zamok et ssh2, accessibles à tous les adhérents
  
- Host appartement appartement.crans.org
+ Host alice alice.crans.org
+     HostName alice.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ Host alice.adm alice.adm.crans.org
+     HostName alice.adm.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ 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
      HostName apprentis.crans.org
 -    User loginCr@ns
 +    User legallic
  
- Host asterisk sip asterisk.crans.org sip.crans.org
+ Host asterisk sip stun voip asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org
      HostName asterisk.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host asterisk.adm asterisk.adm.crans.org
@@@ -311,21 -109,11 +321,11 @@@ Host backbone.wifi backbone.wifi.crans.
  
  Host batk-0 batk-0.crans.org
      HostName batk-0.crans.org
 -    User loginCr@ns
 +    User legallic
  
- Host canard.adm canard.adm.crans.org
-     HostName canard.adm.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host canard.ferme canard canard.ferme.crans.org
-     HostName canard.ferme.crans.org
-     User legallic
-     ForwardAgent yes
- 
  Host cas auth login cas.crans.org login.crans.org auth.crans.org
      HostName cas.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host cas.adm cas.adm.crans.org
@@@ -335,32 -123,32 +335,32 @@@
  
  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 darcs.crans.org
      HostName charybde.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host git git.crans.org
-     HostName geet.crans.org
-     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
      HostName charybde.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host civet.crans.org civet
+ Host civet rabbitmq vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
      HostName civet.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
 -    User loginCr@ns
+ Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
+     HostName civet.adm.crans.org
++    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
+ 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 dhcp dhcp.crans.org
@@@ -375,22 -163,12 +375,12 @@@ Host dhcp-21 dhcp-21.crans.or
  
  Host dhcp.adm dhcp.adm.crans.org
      HostName dhcp.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host dindon.adm dindon.adm.crans.org
-     HostName dindon.adm.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host dindon.ferme dindon dindon.ferme.crans.org
-     HostName dindon.ferme.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host dyson munin nagios dyson.crans.org munin.crans.org nagios.crans.org
+ Host dyson dyson.crans.org
      HostName dyson.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
@@@ -400,52 -178,77 +390,77 @@@
  
  Host ethercalc ethercalc.crans.org
      HostName ethercalc.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
 -    User loginCr@ns
+ Host ethercalc.adm ethercalc.adm.crans.org
+     HostName ethercalc.adm.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
-     HostName geet.crans.org
+ Host ft ft.crans.org
+     HostName ft.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
+ Host ft-ilo ft-ilo.crans.org
+     HostName ft-ilo.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host gordon gordon.crans.org
-     HostName gordon.crans.org
+ Host ft.adm ft.adm.crans.org
+     HostName ft.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host gordon.adm gordon.adm.crans.org
-     HostName gordon.adm.crans.org
+ Host fy munin fy.crans.org munin.crans.org
+     HostName fy.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host gordon.wifi nectaris.wifi ragnarok.wifi vpn wifi-update gordon.wifi.crans.org wifi-update.crans.org nectaris.wifi.crans.org vpn.crans.org ragnarok.wifi.crans.org
-     HostName gordon.wifi.crans.org
+ Host fy.adm fy.adm.crans.org
+     HostName fy.adm.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ Host fz fz.crans.org
+     HostName fz.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host horde horde.crans.org
+ Host fz.adm fz.adm.crans.org
+     HostName fz.adm.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ 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
+     HostName geet.adm.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ Host horde webmail horde.crans.org webmail.crans.org
      HostName horde.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host horde.adm horde.adm.crans.org
      HostName horde.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host irc qwebirc web-irc irc.crans.org web-irc.crans.org qwebirc.crans.org
+ Host irc qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
      HostName irc.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host irc.adm irc.adm.crans.org
@@@ -460,32 -263,22 +475,22 @@@ Host isc isc.crans.or
  
  Host isc.adm isc.adm.crans.org
      HostName isc.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host jouvence poulet poulet.ferme jouvence.crans.org poulet.ferme.crans.org
-     HostName jouvence.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host jouvence.adm poulet.adm jouvence.adm.crans.org poulet.adm.crans.org
-     HostName jouvence.adm.crans.org
-     User legallic
-     ForwardAgent yes
- 
  Host kdell kdell.crans.org
      HostName kdell.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host kdell.adm kdell.adm.crans.org
      HostName kdell.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host kenobi infinoted kenobby laval obby kenobi.crans.org obby.crans.org kenobby.crans.org infinoted.crans.org laval.crans.org
+ Host kenobi infinoted kenobby laval obby pad pastebin zero kenobi.crans.org obby.crans.org kenobby.crans.org infinoted.crans.org laval.crans.org pad.crans.org zero.crans.org pastebin.crans.org
      HostName kenobi.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host kenobi.adm kenobi.adm.crans.org
@@@ -510,37 -303,27 +515,27 @@@ Host komaz.adm komaz.adm.crans.or
  
  Host komaz.wifi komaz.wifi.crans.org
      HostName komaz.wifi.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host lapin.adm lapin.adm.crans.org
-     HostName lapin.adm.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host lapin.ferme lapin lapin.ferme.crans.org
-     HostName lapin.ferme.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
      HostName malloc.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host mdr television vache vache.ferme mdr.crans.org television.crans.org vache.ferme.crans.org
-     HostName mdr.crans.org
+ Host mediadrop video mediadrop.crans.org video.crans.org
+     HostName mediadrop.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host mdr.adm vache.adm mdr.adm.crans.org vache.adm.crans.org
-     HostName mdr.adm.crans.org
+ Host mediadrop.adm mediadrop.adm.crans.org
+     HostName mediadrop.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host nat64 nat64.crans.org
@@@ -570,12 -353,12 +565,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 autostatus ca crans.ens-cachan.fr crans.org doc federez i-p install-party map webalizer wifi wiki wikipedia www niomniom.crans.org wiki.crans.org www.crans.org install-party.crans.org autostatus.crans.org federez.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
+ 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
      HostName niomniom.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host niomniom.adm niomniom.adm.crans.org
@@@ -590,42 -373,52 +585,52 @@@ Host o2 intranet2 switchs o2.crans.org 
  
  Host o2.adm o2.adm.crans.org
      HostName o2.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host oie.adm oie.adm.crans.org
-     HostName oie.adm.crans.org
+ Host odlyd odlyd.crans.org
+     HostName odlyd.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host oie.ferme oie oie.ferme.crans.org
-     HostName oie.ferme.crans.org
+ 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 ovh msn ovh.crans.org msn.crans.org
-     HostName ovh.crans.org
+ Host oie oie oie.ferme oie.crans.org oie.ferme.crans.org
+     HostName oie.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host ovh.adm ovh.adm.crans.org
-     HostName ovh.adm.crans.org
+ Host oie.adm oie.adm.crans.org
+     HostName oie.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host owl imap pop webmail owl.crans.org pop.crans.org imap.crans.org webmail.crans.org
+ 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 owl.adm.crans.org
+ 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
  
 -    User loginCr@ns
+ Host pea pea.crans.org
+     HostName pea.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ Host pea.adm pea.adm.crans.org
+     HostName pea.adm.crans.org
++    User legallic
+     ForwardAgent yes
+ 
  Host pegase pegase.crans.org
      HostName pegase.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host puppet puppet.crans.org
@@@ -645,12 -438,17 +650,17 @@@ Host redisdead lists smtp redisdead.cra
  
  Host redisdead.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org
      HostName redisdead.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
 -    User loginCr@ns
+ Host rezosup rezosup.crans.org
+     HostName rezosup.crans.org
++    User legallic
+     ForwardAgent yes
+ 
  Host roundcube roundcube.crans.org
      HostName roundcube.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host roundcube.adm roundcube.adm.crans.org
@@@ -680,22 -478,12 +690,12 @@@ Host sable dns proxy sable.crans.org pr
  
  Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org
      HostName sable.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- Host schrodingred schrodingred.crans.org
-     HostName schrodingred.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host schrodingred.adm schrodingred.adm.crans.org
-     HostName schrodingred.adm.crans.org
-     User legallic
-     ForwardAgent yes
- 
  Host sogo sogo.crans.org
      HostName sogo.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host sogo.adm sogo.adm.crans.org
@@@ -704,8 -492,13 +704,13 @@@
      ForwardAgent yes
  
  Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
-     HostName soyoustart.crans.org
+     HostName soyouz.crans.org
 -    User loginCr@ns
++    User legallic
+     ForwardAgent yes
+ 
+ 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
@@@ -713,12 -506,17 +718,17 @@@
      # pour passer à travers les blocages de ports (443 = https)
      HostName 138.231.136.2
      Port 443
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
 -    User loginCr@ns
+ Host stun-secondary stun-secondary.crans.org
+     HostName stun-secondary.crans.org
++    User legallic
+     ForwardAgent yes
+ 
  Host template template.crans.org
      HostName template.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host template.adm template.adm.crans.org
@@@ -758,12 -556,17 +768,17 @@@ Host tracker.adm tracker.adm.crans.or
  
  Host vo calendrier intranet-dev news-dev openid-dev weavesync vo.crans.org weavesync.crans.org intranet-dev.crans.org calendrier.crans.org openid-dev.crans.org news-dev.crans.org
      HostName vo.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
 -    User loginCr@ns
+ Host vo-eth0 vo-eth0.crans.org
+     HostName vo-eth0.crans.org
++    User legallic
+     ForwardAgent yes
+ 
  Host vo.adm vo.adm.crans.org
      HostName vo.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host xmpp aim chat.yahoo conference conference.jabber icq jabber yahoo xmpp.crans.org icq.crans.org aim.crans.org conference.crans.org jabber.crans.org yahoo.crans.org chat.yahoo.crans.org conference.jabber.crans.org
@@@ -783,25 -586,19 +798,19 @@@ 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 bda-paris bleu blogs 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
+ 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
      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
      HostName zamok.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
- # Pas vraiment un serveur Cr@ns
- Host rezosup rezosup.crans.org
-     HostName rezosup.crans.org
-     User legallic
-     ForwardAgent yes
- 
  
  # +-------------------------+
  # | Serveurs Cr@ns adm-only |
@@@ -828,33 -618,15 +830,15 @@@ Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.cr
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
- Host daath.adm daath daath daath.adm.crans.org
-     HostName daath.adm.crans.org
-     User legallic
-     ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
- 
  Host eap.adm eap eap eap.adm.crans.org
      HostName eap.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      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 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 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
@@@ -866,28 -638,16 +850,16 @@@ Host fy-ilo.adm fy-ilo fy-ilo fy-ilo.ad
      ProxyCommand ssh sable.crans.org -W %h:%p
      HostKeyAlgorithms ssh-rsa
  
- Host fy.adm fy fy fy.adm.crans.org
-     HostName fy.crans.org
-     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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
      HostKeyAlgorithms ssh-rsa
  
- Host fz.adm fz fz fz.adm.crans.org
-     HostName fz.crans.org
-     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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
@@@ -898,11 -658,12 +870,12 @@@ Host komaz-ilo.adm komaz-ilo komaz-ilo 
      ProxyCommand ssh sable.crans.org -W %h:%p
      HostKeyAlgorithms ssh-rsa
  
- Host pea.adm pea pea pea.adm.crans.org
-     HostName pea.adm.crans.org
+ Host odlyd-ilo.adm odlyd-ilo odlyd-ilo odlyd-ilo.adm.crans.org
+     HostName odlyd-ilo.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
+     HostKeyAlgorithms ssh-rsa
  
  Host radius.adm radius radius radius.adm.crans.org
      HostName radius.adm.crans.org
@@@ -923,15 -684,9 +896,9 @@@ Host slon.adm slon slon slon.adm.crans.
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
- Host test42.adm test42 test42 test42.adm.crans.org
-     HostName test42.adm.crans.org
-     User legallic
-     ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
- 
  Host vert.adm ldap.adm vert zelda.adm vert vert.adm.crans.org ldap.adm.crans.org zelda.adm.crans.org
      HostName vert.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
@@@ -997,69 -747,33 +964,40 @@@ 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
++# 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 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)