From: Vincent Le Gallic <legallic@crans.org>
Date: Mon, 31 Mar 2014 19:19:21 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=132f236bd58b95918b931de4e141a297597c1e27;hp=-c;p=config-20-100.git

Merge branch 'master' into perso
---

132f236bd58b95918b931de4e141a297597c1e27
diff --combined .bashrc
index 7717833,057bd56..6df39e2
--- a/.bashrc
+++ b/.bashrc
@@@ -299,6 -299,7 +299,6 @@@ function welcome_message (
  ### ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ###
  ### Attention à ce que vous avez édité dans cette section ###
  
 -
  # +---------------------------------------+
  # | Gestion de l'historique des commandes |
  # +---------------------------------------+
@@@ -308,10 -309,10 +308,10 @@@
  export HISTCONTROL=ignoreboth
  
  # Nombre de lignes d'historique à garder
 -export HISTSIZE=5000
 +export HISTSIZE=
  
  # la même chose dans le fichier d'historique
 -export HISTFILESIZE=5000
 +export HISTFILESIZE=
  
  # Mémoriser le timestamp d'exécution de la commande
  export HISTTIMEFORMAT='%F %T - '
@@@ -329,7 -330,7 +329,7 @@@ shopt -s histappen
  
  # Pour éviter un troll, aucune ligne de cette section n'est décommentée.
  # Choisissez la vôtre.
 -#~# export EDITOR='/usr/bin/nano'
 +export EDITOR='/usr/bin/nano'
  #~# export EDITOR='/usr/bin/vim'
  #~# export EDITOR='/usr/bin/emacs'
  #~# export EDITOR='/usr/bin/jed'
@@@ -337,6 -338,11 +337,11 @@@
  # Ajouter ~/bin, /sbin et /usr/sbin à son PATH
  PATH=~/bin:$PATH:/sbin:/usr/sbin
  
+ 
+ # +----------+
+ # | Sourcing |
+ # +----------+
+ 
  # Chargement des alias
  if [ -f ~/.bash_aliases ]; then
      . ~/.bash_aliases
@@@ -349,6 -355,11 +354,11 @@@ if [ -f ~/.bash_aliases_local ]; the
      . ~/.bash_aliases_local
  fi
  
+ 
+ # +-----+
+ # | End |
+ # +-----+
+ 
  # On n'exécute le welcome_message que à ce moment, parce que la customisation
 -# local a pu changer des couleurs
 +# locale a pu changer des couleurs
  welcome_message
diff --combined .ssh/config
index ff709e3,0de1fe0..1b76a2d
--- a/.ssh/config
+++ b/.ssh/config
@@@ -2,7 -2,6 +2,7 @@@
  # par les gentils membres actifs du Cr@ns
  # Vous pouvez l'utilisez, le redistribuer, le modifier à votre convenance.
  # Des questions, des suggestions : {nounou,ca}@lists.crans.org
 +#  Typiquement, vous pouvez proposer d'ajouter la conf pour accéder à votre département
  # Licence : WTFPL
  
  # Les sections commentées par #~# sont des features qui ne sont pas activées
@@@ -40,176 -39,14 +40,176 @@@ VerifyHostKeyDNS ye
  # ProxyCommand = pour passer par un autre serveur intermédiaire
  #                (pour un serveur qui ne peut pas être contacté directement)
  
 +
 +# +--------------+
 +# | Mes machines |
 +# +--------------+
 +
 +Host cerebro.crans.org cerebro
 +    HostName cerebro.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host eva.crans.org eva eeepc
 +    HostName eva.crans.org
 +    User vincent
 +    ForwardX11 yes
 +    ForwardAgent yes
 +
 +Host cabal.crans.org cabal
 +    HostName cabal.crans.org
 +    User vincent
 +    ForwardX11 yes
 +    ForwardAgent yes
 +
 +Host viki viki.wifi viki.wifi.crans.org
 +    HostName viki.wifi.crans.org
 +    User root
 +    Port 2222
 +
 +# Les bots sur cerebro
 +Host basile
 +    HostName cerebro.crans.org
 +    User basile
 +    ForwardAgent yes
 +Host note-cerebro
 +    HostName cerebro.crans.org
 +    User note
 +    ForwardAgent yes
 +Host deconnaisseur
 +    HostName cerebro.crans.org
 +    User deconnaisseur
 +    ForwardAgent yes
 +Host pendu Hung hung
 +    HostName cerebro.crans.org
 +    User hung
 +    ForwardAgent yes
 +Host historien
 +    HostName cerebro.crans.org
 +    User historien
 +    ForwardAgent yes
 +Host salesman Salesman
 +    HostName cerebro.crans.org
 +    User salesman
 +    ForwardAgent yes
 +Host themis Themis
 +    HostName cerebro.crans.org
 +    User themis
 +    ForwardAgent yes
 +Host saturnin Saturnin
 +    HostName cerebro.crans.org
 +    User saturnin
 +    ForwardAgent yes
 +Host ibot iBot
 +    HostName cerebro.crans.org
 +    User ibot
 +    ForwardAgent yes
 +
 +
 +# +--------+
 +# | Pimeys |
 +# +--------+
 +# Serveur dédié ovh
 +# pimeys.fr = 176.31.106.206
 +
 +Host pimeys pimeys.fr
 +    HostName pimeys.fr
 +    User vincent
 +    ForwardAgent yes
 +
 +# Nouveau dédié
 +# becue.eu = 62.210.178.115
 +Host becue becue.eu
 +    HostName becue.eu
 +    User vincent
 +    ForwardAgent yes
 +
 +
  # +-----------------+
  # | Machines du BDE |
  # +-----------------+
 +# Parce que j'étais respo-info Makiavé[list]
  
  Host kfet kfet.crans.org kfet1
      HostName kfet.crans.org
      User bde
  
 +Host kfet2 kfet2.crans.org
 +    HostName kfet2.crans.org
 +    User vincent
 +
 +Host bde bde.crans.org note mininote invitation invitations note.crans.org mininote.crans.org invitations.crans.org invitation.crans.org
 +    HostName note.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host bde2 bde2.crans.org note2
 +    HostName bde2.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host bde3 bde3.crans.org
 +    HostName bde3.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host video videobde videobde.crans.org
 +    HostName videobde.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host bureau bureau-bde bureau-bde.crans.org
 +    HostName bureau-bde.crans.org
 +    User bde
 +
 +
 +# +----+
 +# | PE |
 +# +----+
 +# Parce que j'y suis le bienvenu
 +
 +Host linkki linkki.crans.org
 +    HostName linkki.crans.org
 +    User sword
 +
 +Host ilma ilma.wifi ilma.wifi.crans.org
 +    HostName ilma.wifi.crans.org
 +    User sword
 +
 +Host ruoska ruoska.crans.org
 +    HostName ruoska.crans.org
 +    User vincent
 +
 +
 +# +-----+
 +# | Nit |
 +# +-----+
 +# Parce que j'y suis le bienvenu
 +
 +# Le ftp de Nit, gère A♡-TV. 
 +Host power power.crans.org nit-git nit-git.crans.org
 +    HostName power.crans.org
 +    User vincent
 +
 +# Réplicat du wikoeur
 +Host genua acoeur.genua.fr
 +    HostName acoeur.genua.fr
 +    User root
 +    AddressFamily inet6
 +
 +# +----+
 +# | A♡ |
 +# +----+
 +# Parce que le département A♡ a une raspberry PI et un serveur !
 +
 +Host rasputin rasputin.crans.org raspyjordy.crans.org raspyjordy
 +    HostName rasputin.crans.org
 +    User vincent
 +
 +Host acoeur acoeur.crans.org
 +    HostName acoeur.crans.org
 +    User vincent
 +    ForwardAgent yes
  
  # +-------------------+
  # | Serveurs du Cr@ns |
@@@ -219,435 -56,430 +219,435 @@@
  
  Host appartement appartement.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
      HostName asterisk.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host asterisk.adm asterisk.adm.crans.org
      HostName asterisk.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host backbone backbone.crans.org
      HostName backbone.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host backbone.adm backbone.adm.crans.org
      HostName backbone.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host backbone.wifi backbone.wifi.crans.org
      HostName backbone.wifi.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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 loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host canard.ferme canard canard.ferme.crans.org
      HostName canard.ferme.crans.org
 -    User loginCr@ns
 +    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
      HostName cas.adm.crans.org
 -    User loginCr@ns
 +    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
 +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
      HostName civet.crans.org
 -    User loginCr@ns
 +    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
      HostName cochon.ferme.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
      HostName dhcp-21.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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 loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host dindon.ferme dindon dindon.ferme.crans.org
      HostName dindon.ferme.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host dyson munin nagios dyson.crans.org munin.crans.org nagios.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
      HostName dyson.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ethercalc ethercalc.crans.org
      HostName ethercalc.crans.org
-     User legallic
+     User loginCr@ns
      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
 -    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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host gordon gordon.crans.org
      HostName gordon.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host gordon.adm gordon.adm.crans.org
      HostName gordon.adm.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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host horde horde.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
      HostName irc.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host irc.adm irc.adm.crans.org
      HostName irc.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host isc isc.crans.org
      HostName isc.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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 loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host jouvence.adm poulet.adm jouvence.adm.crans.org poulet.adm.crans.org
      HostName jouvence.adm.crans.org
 -    User loginCr@ns
 +    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
      HostName kenobi.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host kenobi.adm kenobi.adm.crans.org
      HostName kenobi.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host komaz komaz.crans.org
      HostName komaz.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host komaz-21 komaz-21.crans.org
      HostName komaz-21.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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 loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host lapin.adm lapin.adm.crans.org
      HostName lapin.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host lapin.ferme lapin lapin.ferme.crans.org
      HostName lapin.ferme.crans.org
 -    User loginCr@ns
 +    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
 -    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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host nat64 nat64.crans.org
      HostName nat64.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host nat64.adm nat64.adm.crans.org
      HostName nat64.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host nem nem.crans.org
      HostName nem.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host nem.adm nem.adm.crans.org
      HostName nem.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host news web-news webnews news.crans.org web-news.crans.org webnews.crans.org
      HostName news.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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
      HostName niomniom.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host niomniom.adm niomniom.adm.crans.org
      HostName niomniom.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org
      HostName o2.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host oie.ferme oie oie.ferme.crans.org
      HostName oie.ferme.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ovh msn ovh.crans.org msn.crans.org
      HostName ovh.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ovh.adm ovh.adm.crans.org
      HostName ovh.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
      HostName owl.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host owl.adm owl.adm.crans.org
      HostName owl.adm.crans.org
 -    User loginCr@ns
 +    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
      HostName puppet.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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
      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
      HostName redisdead.adm.crans.org
 -    User loginCr@ns
 +    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
      HostName roundcube.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host routeur deconnexion routeur.crans.org deconnexion.crans.org
      HostName routeur.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host routeur-21 routeur-21.crans.org
      HostName routeur-21.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host routeur.adm routeur.adm.crans.org
      HostName routeur.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host sable dns proxy sable.crans.org proxy.crans.org dns.crans.org
      HostName sable.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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 loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host schrodingred.adm schrodingred.adm.crans.org
      HostName schrodingred.adm.crans.org
 -    User loginCr@ns
 +    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
      HostName sogo.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
      HostName soyoustart.crans.org
 -    HostName loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ssh2 ssh2.crans.org
@@@ -655,93 -487,87 +655,93 @@@
      # pour passer à travers les blocages de ports (443 = https)
      HostName 138.231.136.2
      Port 443
 -    User loginCr@ns
 +    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
      HostName template.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host thot psuornotpsu thot.crans.org psuornotpsu.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
      HostName thot.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host titanic titanic.crans.org
      HostName titanic.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host titanic.adm titanic.adm.crans.org
      HostName titanic.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host tracker todo tracker.crans.org todo.crans.org
      HostName tracker.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host tracker.adm tracker.adm.crans.org
      HostName tracker.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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
  
  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
      HostName xmpp.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host xmpp.adm jabber.adm xmpp.adm.crans.org jabber.adm.crans.org
      HostName xmpp.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ytrap-llatsni ytrap-llatsni.crans.org
      HostName ytrap-llatsni.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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
      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
  
  
@@@ -754,172 -580,170 +754,172 @@@
  
  Host alice.adm alice alice alice.adm.crans.org
      HostName alice.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
  Host babar.adm babar babar babar.adm.crans.org
      HostName babar.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
  Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
      HostName bcfg2.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      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 loginCr@ns
 +    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 loginCr@ns
 +    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 loginCr@ns
 +    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
  
  Host fy-ilo.adm fy-ilo fy-ilo fy-ilo.adm.crans.org
      HostName fy-ilo.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      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 loginCr@ns
 +    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 loginCr@ns
 +    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
  
  Host komaz-ilo.adm komaz-ilo komaz-ilo komaz-ilo.adm.crans.org
      HostName komaz-ilo.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      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
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
  Host radius.adm radius radius radius.adm.crans.org
      HostName radius.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.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 loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
      HostKeyAlgorithms ssh-rsa
  
  Host slon.adm slon slon slon.adm.crans.org
      HostName slon.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      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 loginCr@ns
 +    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
  
  Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
      HostName zbee-idrac.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.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 loginCr@ns
 +    User legallic
      ForwardAgent yes
      ProxyCommand ssh sable.crans.org -W %h:%p
  
  
 -#~# # +---------+
 -#~# # | FedeRez |
 -#~# # +---------+
 -#~# # Accessibles aux membres de l'équipe d'admin de FedeRez
 -#~# 
 -#~# # Actuellement down, mais on ne sait jamais
 -#~# Host nautilus nautilus.federez.net
 -#~#     HostName nautilus.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
 -#~#     HostName baldrick.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host quigon quigon.federez.net
 -#~#     HostName quigon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host polygon polygon.federez.net
 -#~#     HostName polygon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host hexagon hexagon.federez.net
 -#~#     HostName hexagon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 +# +---------+
 +# | FedeRez |
 +# +---------+
 +# Accessibles aux membres de l'équipe d'admin de FedeRez
 +
 +# Actuellement down, mais on ne sait jamais
 +Host nautilus nautilus.federez.net
 +    HostName nautilus.federez.net
 +    User legallic
 +    ForwardAgent yes
 +
 +Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
 +    HostName baldrick.federez.net
 +    User legallic
 +    ForwardAgent yes
 +
 +Host quigon quigon.federez.net
 +    HostName quigon.federez.net
 +    User legallic
 +    ForwardAgent yes
 +
 +Host polygon polygon.federez.net
 +    HostName polygon.federez.net
 +    User legallic
 +    ForwardAgent yes
 +
 +Host hexagon hexagon.federez.net
 +    HostName hexagon.federez.net
 +    User legallic
 +    ForwardAgent yes
  
  
  # +-------------------+
@@@ -929,79 -753,38 +929,79 @@@
  
  Host tselin tselin.clietu tselin.clietu.ens-cachan.fr acces1.rip.ens-cachan.fr acces1 rip
      HostName tselin.clietu.ens-cachan.fr
 -    User loginENS
 -    ProxyCommand ssh loginENS@tahines.ens-cachan.fr -W %h:%p
 +    User vlegalli
 +    ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
 +
 +Host tselin2
 +    HostName tselin2.clietu.ens-cachan.fr
 +    User vlegalli
 +    ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
  
  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 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)