Merge branch 'perso' into taf

Conflicts:
	.ssh/config

diff --combined .ssh/config
index d2ee7b5b776023035498f7cd8e4dcc04c8d56b8d,f465ad13079c841b6ab9fe09237501a7a3d7a05a..28938119f747f4573a9669a814837693de42f58a
--- 1/.ssh/config
--- 2/.ssh/config
+++ b/.ssh/config
@@@ -55,6 -55,16 +55,16 @@@ UserKnownHostsFile ~/.ssh/known_hosts ~
  # | Mes machines |
  # +--------------+
  
+ Host zeldrenviatahinesviapimeys
+     HostName zeldren.crans.org
+     User vincent
+     ProxyCommand ssh tahinesviapimeys -W %h:%p
+ 
+ Host tahinesviapimeys
+     HostName tahines.ens-cachan.fr
+     User vlegalli
+     ProxyCommand ssh pimeys.fr -W %h:%p
+ 
  Host zeldren.crans.org zeldren
      HostName zeldren.crans.org
      User vincent
@@@ -92,8 -102,8 +102,8 @@@ Host evaw.home eva
      ForwardAgent yes
      ProxyCommand ssh home.b2moo.fr -W %h:%p
  
- Host cabal.crans.org cabal.crans
-     HostName cabal.crans.org
+ Host zeldren.crans.org cabal.crans zeldren
+     HostName zeldren.crans.org
      User vincent
      ForwardAgent yes
  
@@@ -113,6 -123,12 +123,12 @@@ Host cabal.home caba
      ForwardAgent yes
      ProxyCommand ssh -4 home.b2moo.fr -W %h:%p
  
+ Host cabalviabox
+     HostName home.b2moo.fr
+     Port 2222
+     User vincent
+     ForwardAgent yes
+ 
  Host cabalw.home cabalw
      HostName 192.168.1.63
      User vincent
@@@ -296,7 -312,7 +312,7 @@@ Host apprentis munin-apprentis apprenti
      HostName apprentis.crans.org
      User legallic
  
 -Host asterisk sip stun voip asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org
 +Host asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org
      HostName asterisk.crans.org
      User legallic
      ForwardAgent yes
@@@ -335,7 -351,7 +351,7 @@@ Host batk-0 batk-0.crans.or
      HostName batk-0.crans.org
      User legallic
  
 -Host cas cas-srv auth login cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
 +Host cas-srv cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
      HostName cas-srv.crans.org
      User legallic
      ForwardAgent yes
@@@ -345,7 -361,7 +361,7 @@@ Host cas.adm cas.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -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
 +Host charybde darcs ftp.crans.ens-cachan.fr 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 legallic
      ForwardAgent yes
@@@ -375,7 -391,7 +391,7 @@@ Host cochon.ferme cochon cochon televis
      User legallic
      ForwardAgent yes
  
 -Host cups cups.crans.org
 +Host cups.crans.org
      HostName cups.crans.org
      User legallic
      ForwardAgent yes
@@@ -385,7 -401,7 +401,7 @@@ Host cups.adm cups.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host dhcp dhcp.crans.org
 +Host dhcp.crans.org
      HostName dhcp.crans.org
      User legallic
      ForwardAgent yes
@@@ -425,7 -441,7 +441,7 @@@ Host ethercalc.adm ethercalc.adm.crans.
      User legallic
      ForwardAgent yes
  
 -Host freebox freebox.crans.org
 +Host freebox.crans.org
      HostName freebox.crans.org
      User legallic
      ForwardAgent yes
@@@ -470,7 -486,7 +486,7 @@@ Host fz.adm fz.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
 +Host geet geet.crans.org git.crans.org gitlab.crans.org
      HostName geet.crans.org
      User legallic
      ForwardAgent yes
@@@ -490,7 -506,7 +506,7 @@@ Host horde.adm horde.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host irc qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
 +Host qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
      HostName irc.crans.org
      User legallic
      ForwardAgent yes
@@@ -500,7 -516,7 +516,7 @@@ Host irc.adm irc.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host isc isc.crans.org
 +Host isc.crans.org
      HostName isc.crans.org
      User legallic
      ForwardAgent yes
@@@ -595,7 -611,7 +611,7 @@@ Host news.adm web-news.adm webnews.adm 
      User legallic
      ForwardAgent yes
  
 -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
 +Host niomniom 15ans crans.ens-cachan.fr crans.org install-party webalizer 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 legallic
      ForwardAgent yes
@@@ -650,7 -666,7 +666,7 @@@ Host omnomnom.adm omnomnom.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
 +Host owl owl.crans.org pop.crans.org imap.crans.org
      HostName owl.crans.org
      User legallic
      ForwardAgent yes
@@@ -660,7 -676,7 +676,7 @@@ Host owl.adm imap.adm pop.adm owl.adm.c
      User legallic
      ForwardAgent yes
  
 -Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org
 +Host owcloud-srv owncloud.crans.org owncloud-srv.crans.org
      HostName owncloud.crans.org
      User legallic
      ForwardAgent yes
@@@ -685,12 -701,12 +701,12 @@@ Host pegase pegase.crans.or
      User legallic
      ForwardAgent yes
  
 -Host proxy proxy.crans.org
 +Host proxy.crans.org
      HostName proxy.crans.org
      User legallic
      ForwardAgent yes
  
 -Host puppet puppet.crans.org
 +Host puppet.crans.org
      HostName puppet.crans.org
      User legallic
      ForwardAgent yes
@@@ -700,7 -716,7 +716,7 @@@ Host puppet.adm puppet.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -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
 +Host redisdead redisdead.crans.org lists.crans.org smtp.crans.org liste.crans.org listes.crans.org list.crans.org
      HostName redisdead.crans.org
      User legallic
      ForwardAgent yes
@@@ -725,7 -741,7 +741,7 @@@ Host roundcube.adm roundcube.adm.crans.
      User legallic
      ForwardAgent yes
  
 -Host routeur deconnexion routeur.crans.org deconnexion.crans.org
 +Host deconnexion routeur.crans.org deconnexion.crans.org
      HostName routeur.crans.org
      User legallic
      ForwardAgent yes
@@@ -750,16 -766,6 +766,6 @@@ Host sable.adm proxy.adm sable.adm.cran
      User legallic
      ForwardAgent yes
  
- Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org
-     HostName sogo.crans.org
-     User legallic
-     ForwardAgent yes
- 
- Host sogo.adm sogo.adm.crans.org
-     HostName sogo.adm.crans.org
-     User legallic
-     ForwardAgent yes
- 
  Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
      HostName soyouz.crans.org
      User legallic
@@@ -770,7 -776,7 +776,7 @@@ Host soyouz.adm soyoustart.adm soyouz.a
      User legallic
      ForwardAgent yes
  
 -Host ssh2 mosh ssh2.crans.org mosh.crans.org
 +Host 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
@@@ -803,17 -809,17 +809,17 @@@ Host template.adm template.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host test1 test1.crans.org
 +Host test1.crans.org
      HostName test1.crans.org
      User legallic
      ForwardAgent yes
  
 -Host test2 test2.crans.org
 +Host test2.crans.org
      HostName test2.crans.org
      User legallic
      ForwardAgent yes
  
 -Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
 +Host thot psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
      HostName thot.crans.org
      User legallic
      ForwardAgent yes
@@@ -833,7 -839,7 +839,7 @@@ Host titanic.adm titanic.adm.crans.or
      User legallic
      ForwardAgent yes
  
 -Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
 +Host tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
      HostName tracker.crans.org
      User legallic
      ForwardAgent yes
@@@ -878,7 -884,7 +884,7 @@@ Host ytrap-llatsni.adm ytrap-llatsni.ad
      User legallic
      ForwardAgent yes
  
 -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 pot-vieux.crans.org
 +Host zamok clubs.ens-cachan.fr 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 pot-vieux.crans.org
      HostName zamok.crans.org
      User legallic
      ForwardAgent yes
@@@ -899,24 -905,24 +905,24 @@@ Host babar.adm babar babar babar.adm.cr
      HostName babar.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
      HostName bcfg2.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host eap.adm eap eap eap.adm.crans.org
      HostName eap.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.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 root
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host *-ilo
      HostName %h.adm.crans.org
@@@ -934,44 -940,44 +940,44 @@@
      MACs hmac-md5,hmac-sha1
      Ciphers aes128-cbc,3des-cbc
      HostKeyAlgorithms ssh-rsa,ssh-dss
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host radius.adm radius radius radius.adm.crans.org
      HostName radius.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host sable-ilo.adm sable-ilo sable-ilo sable-ilo.adm.crans.org
      HostName sable-ilo.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
      HostKeyAlgorithms ssh-rsa
  
  Host slon.adm slon slon slon.adm.crans.org
      HostName slon.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.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 legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
      HostName zbee-idrac.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  Host zbee.adm fx.adm nfs.adm zbee zbee zbee.adm.crans.org nfs.adm.crans.org fx.adm.crans.org
      HostName zbee.adm.crans.org
      User legallic
      ForwardAgent yes
-     ProxyCommand ssh sable.crans.org -W %h:%p
+     ProxyCommand ssh redisdead.crans.org -W %h:%p
  
  
  # +---------+
@@@ -1081,16 -1087,13 +1087,24 @@@ Host mars mars.lbpa mars.lbpa.ens-cacha
      User vincent
      ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
  
+ # +---------+
+ # | Télécom |
+ # +---------+
+ 
+ Host rabban rabban.enst.fr
+     HostName rabban.enst.fr
+     User legallic
+ 
  # END (utile pour éviter les merge conflicts)
  
 +# +---------+
 +# | Télécom |
 +# +---------+
 +# Parce que c'est là que je bosse
 +
 +# Namého !
 +Host *
 +    ForwardX11 no
 +
 +# Pas besoin de config spécifique à part ça
 +# le ForwardAgent yes est déjà dans /etc/ssh/ssh_config