Merge branch 'master' into perso

diff --combined .procmailrc
index af1bace600f116b34aee00f1177fc6ffc37e1479,e5a20634534448c112530a99956840de1661a1fa..82a7635ea72c7cfe096a9fedaf89737ee4585543
--- 1/.procmailrc
--- 2/.procmailrc
+++ b/.procmailrc
@@@ -404,14 -404,14 +404,14 @@@ FEDEREZOVHDIR="${FEDEREZADMINDIR}.OVH
  #####                                Règles                                #####
  ################################################################################
  
 -#~# # Patch pour traiter les mails qui ont été
 -#~# # reçus avant le 30/06/13, car certaines règles de tri du .procmailrc
 -#~# # n'étaient pas encore valables à l'époque.
 -#~# # très utile si on veut retrier tous ses mails
 -#~# INCLUDERC="${CONFIGDIR}/retrocompatibility_patch.rules"
 +# Patch pour traiter les mails qui ont été
 +# reçus avant le 30/06/13, car certaines règles de tri du .procmailrc
 +# n'étaient pas encore valables à l'époque.
 +# très utile si on veut retrier tous ses mails
 +INCLUDERC="${CONFIGDIR}/retrocompatibility_patch.rules"
  
 -#~# # Fichier de règles prioritaires à personnaliser
 -#~# INCLUDERC="${CONFIGDIR}/custom.high.rules"
 +# Fichier de règles prioritaires à personnaliser
 +INCLUDERC="${CONFIGDIR}/custom.high.rules"
  
  #################################################################
  ##                Gestion des mails d'Arpwatch                 ##
@@@ -497,9 -497,9 +497,9 @@@
  * ^To:.*(roots?|postgres|www-data|list)@crans\.org
  * ^(X-Cron-Env|From: Anacron)
  {
 -  #~# # Par défaut, on ne trie pas les mails de Cron, pensez à décommenter
 -  #~# # le INCLUDERC (et à copier le fichier complémentaire) pour les trier
 -  #~# INCLUDERC=${CONFIGDIR}/cron.rules
 +  # Par défaut, on ne trie pas les mails de Cron, pensez à décommenter
 +  # le INCLUDERC (et à copier le fichier complémentaire) pour les trier
 +  INCLUDERC=${CONFIGDIR}/cron.rules
    
    :0
    ${CRONDIR}/
@@@ -699,7 -699,7 +699,7 @@@
  {
    # Statistiques d'upload
    :0
-   * ^X-Mailer: /usr/scripts/surveillance/statistiques.py
+   * ^X-Mailer: /usr/scripts/surveillance/statistiques2.py
    ${STATUPLOADDIR}/
    
    :0
@@@ -739,21 -739,21 +739,21 @@@ ${CABLAGEDIR}
  
  
  # Sur la ML respbats@
 -#~# # L'ancienne version de ce filtre ne fonctionne plus car les headers
 -#~# # de ces mails sont maintenant correctement encodé.
 -#~# # C'est bien pour le respect des RFC, mais c'est un peu pain in the ass
 -#~# # p our le trier avec procmail, donc on besoin d'un script
 -#~# # Ne pas décommenter si vous n'avez pas le script associé.
 -#~# # (cf https://wiki.crans.org/VieCrans/FichiersConfiguration#scripting)
 -#~# :0
 -#~# * ^List-Id:.*respbats\.lists\.crans\.org
 -#~# * ^X-Mailer:\/.*
 -#~# {
 -#~#   # Machines supprimées pour chambre invalide
 -#~#   :0
 -#~#   * ? echo "${MATCH}" | ${DECODEHEADERSCRIPT} | grep /usr/scripts/gestion/chambres_vides.py
 -#~#   ${DELETEDMACHINES}/
 -#~# }
 +# L'ancienne version de ce filtre ne fonctionne plus car les headers
 +# de ces mails sont maintenant correctement encodé.
 +# C'est bien pour le respect des RFC, mais c'est un peu pain in the ass
 +# p our le trier avec procmail, donc on besoin d'un script
 +# Ne pas décommenter si vous n'avez pas le script associé.
 +# (cf https://wiki.crans.org/VieCrans/FichiersConfiguration#scripting)
 +:0
 +* ^List-Id:.*respbats\.lists\.crans\.org
 +* ^X-Mailer:\/.*
 +{
 +  # Machines supprimées pour chambre invalide
 +  :0
 +  * ? echo "${MATCH}" | ${DECODEHEADERSCRIPT} | grep /usr/scripts/gestion/chambres_vides.py
 +  ${DELETEDMACHINES}/
 +}
  
  
  #################################################################
@@@ -786,8 -786,8 +786,8 @@@
  #################################################################
  ##              Inclusion des règles personnelles              ##
  #################################################################
 -#~# # Fichier de règles à personnaliser
 -#~# INCLUDERC="${CONFIGDIR}/custom.normal.rules"
 +# Fichier de règles à personnaliser
 +INCLUDERC="${CONFIGDIR}/custom.normal.rules"
  
  #################################################################
  ##                Gestion des mails de Mailman                 ##
@@@ -998,5 -998,5 +998,5 @@@
    ${MLDIR}.${DOMAIN_}.${ML_}/
  }
  
 -#~# # Fichier de règles de faible priorité à personnaliser
 -#~# INCLUDERC="${CONFIGDIR}/custom.final.rules"
 +# Fichier de règles de faible priorité à personnaliser
 +INCLUDERC="${CONFIGDIR}/custom.final.rules"

diff --combined .ssh/config
index e67f776ecdb2cad153778b34b3e574034fc41029,0102a3bfb910fed241ec865ac500155d94215d58..a28e5b1fede04e56ca02babd89d59944c0b7d17e
--- 1/.ssh/config
--- 2/.ssh/config
+++ b/.ssh/config
@@@ -14,7 -14,7 +14,7 @@@
  
  #------------------------------------------------------------------------------
  
- # Les options qui ne sont pas identées sont activées pour toutes les connexions
+ # Les options qui ne sont pas indentées sont activées pour toutes les connexions
  # Mêmes celles qui ne correspondent à aucun bloc plus bas
  # Activer la compression des données transmises lorsque c'est possible
  Compression yes
@@@ -22,21 -22,21 +22,21 @@@
  #~# # Afficher la fingerprint du serveur sous la forme d'un ASCII art
  #~# VisualHostKey yes
  
- # Ne pas hasher les noms des machines auxquelles ont se connecte dans
+ # Ne pas hasher les noms des machines auxquelles on se connecte dans
  # le fichier known_hosts
  HashKnownHosts no
  
  # Vérifier la concordance du champ DNS SSHFP de la machine (si existant)
- # et de la fingerprint présentée par le serveur
+ # et du fingerprint présenté par le serveur
  VerifyHostKeyDNS yes
  
 -#~# # Certaines QuelqueChoseBox tuent les connexion TCP inactives depuis
 -#~# # trop longtemps.
 -#~# # Cette option fait en sorte d'envoyer toutes les 60 secondes un paquet
 -#~# # sur la connexion, pour la garder vivante.
 -#~# ServerAliveInterval 60
 -#~# # Abandonner au bout de 3 échecs (= considérer la connexion comme morte)
 -#~# ServerAliveCountMax 3
 +# Certaines QuelqueChoseBox tuent les connexion TCP inactives depuis
 +# trop longtemps.
 +# Cette option fait en sorte d'envoyer toutes les 60 secondes un paquet
 +# sur la connexion, pour la garder vivante.
 +ServerAliveInterval 60
 +# Abandonner au bout de 3 échecs (= considérer la connexion comme morte)
 +ServerAliveCountMax 3
  
  # Les options suivantes apparaissent dans les blocs
  # Host = commence un bloc avec les noms qui utiliseront ce bloc
@@@ -48,239 -48,14 +48,239 @@@
  # 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
 +    ForwardAgent yes
 +
 +Host eva.local
 +    HostName 192.168.1.12
 +    User vincent
 +    ForwardAgent yes
 +
 +Host evaw.local
 +    HostName 192.168.1.29
 +    User vincent
 +    ForwardAgent yes
 +
 +Host eva.home evaf
 +    HostName 192.168.1.12
 +    User vincent
 +    ForwardAgent yes
 +    ProxyCommand ssh home.b2moo.fr -W %h:%p
 +
 +Host evaw.home evaw
 +    HostName 192.168.1.29
 +    User vincent
 +    ForwardAgent yes
 +    ProxyCommand ssh home.b2moo.fr -W %h:%p
 +
 +Host cabal.crans.org cabal.crans
 +    HostName cabal.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host cabal.local
 +    HostName 192.168.1.81
 +    User vincent
 +    ForwardAgent yes
 +
 +Host cabalw.local
 +    HostName 192.168.1.63
 +    User vincent
 +    ForwardAgent yes
 +
 +Host cabal.home cabal
 +    HostName 192.168.1.81
 +    User vincent
 +    ForwardAgent yes
 +    ProxyCommand ssh home.b2moo.fr -W %h:%p
 +
 +Host cabalw.home cabalw
 +    HostName 192.168.1.63
 +    User vincent
 +    ForwardAgent yes
 +    ProxyCommand ssh home.b2moo.fr -W %h:%p
 +
 +Host viki viki.wifi viki.wifi.crans.org
 +    HostName viki.wifi.crans.org
 +    User root
 +    Port 2222
 +
 +Host gladys home colloc home.b2moo.fr
 +    HostName home.b2moo.fr
 +    User vincent
 +    ForwardAgent yes
 +
 +Host gladys.local
 +    HostName 192.168.1.18
 +    User vincent
 +    ForwardAgent yes
 +
 +# 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é online.net
 +# pimeys.fr = 62.210.178.115
 +
 +Host pimeys pimeys.fr becue.eu
 +    HostName pimeys.fr
 +    User vincent
 +    ForwardAgent yes
 +
 +
  # +-----------------+
  # | Machines du BDE |
  # +-----------------+
 +# Parce que j'étais respo-info Makiavé[list]
  
 -Host kfet kfet.crans.org kfet1
 +Host kfet kfet.crans.org
      HostName kfet.crans.org
      User bde
 +    # IPv4 only
 +    AddressFamily inet
 +    ForwardAgent yes
 +
 +Host kfet-secours kfet-secours.crans.org
 +    HostName kfet-secours.crans.org
 +    User bde
 +    # IPv4 only
 +    AddressFamily inet
 +
 +Host kfet2 kfet2.crans.org
 +    HostName kfet2.crans.org
 +    User vincent
 +
 +Host bde-test note-test bde-test.crans.org note-test.crans.org
 +    HostName bde-test.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host ldap-bde bde2 bde-fallback bde2.crans.org ldap-bde.crans.org bde-fallback.crans.org
 +    HostName bde2.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host bde3 bde3.crans.org
 +    HostName bde3.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host note bde2-virt bde note.crans.ort bde2-virt.crans.org bde.crans.org
 +    HostName bde2-virt.crans.org
 +    User vincent
 +    ForwardAgent yes
 +
 +Host note bde3-virt bde note.crans.ort bde3-virt.crans.org bde.crans.org
 +    HostName bde3-virt.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
 +
 +Host med zavoyarde med.crans.org zavoyarde.crans.org
 +    HostName zavoyarde.crans.org
 +    User vincent
 +
 +# +----+
 +# | 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 un serveur
 +
 +Host acoeur acoeur.crans.org
 +    HostName acoeur.crans.org
 +    User vincent
 +    ForwardAgent yes
  
  # +-------------------+
  # | Serveurs du Cr@ns |
@@@ -290,465 -65,465 +290,465 @@@
  
  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 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
 -    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 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 darcs.crans.org
      HostName charybde.crans.org
 -    User loginCr@ns
 +    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 rabbitmq vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
      HostName civet.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
      HostName civet.adm.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 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
      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 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
      HostName dyson.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ethercalc ethercalc.crans.org
      HostName ethercalc.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ethercalc.adm ethercalc.adm.crans.org
      HostName ethercalc.adm.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host freebox freebox.crans.org
      HostName freebox.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host ft ft.crans.org
      HostName ft.crans.org
 -    User loginCr@ns
 +    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
      HostName fy.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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 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 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
      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 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
      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 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 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
      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 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 mediadrop video mediadrop.crans.org video.crans.org
      HostName mediadrop.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host mediadrop.adm mediadrop.adm.crans.org
      HostName mediadrop.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 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
      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 odlyd odlyd.crans.org
      HostName odlyd.crans.org
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  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
      HostName pea.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 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 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
      HostName rezosup.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 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 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 mosh ssh2.crans.org mosh.crans.org
@@@ -756,97 -531,97 +756,97 @@@
      # pour passer à travers les blocages de ports (443 = https)
      HostName 138.231.136.2
      Port 443
 -    User loginCr@ns
 +    User legallic
      ForwardAgent yes
  
  Host stun-secondary stun-secondary.crans.org
      HostName stun-secondary.crans.org
 -    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 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 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
      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-eth0 vo-eth0.crans.org
      HostName vo-eth0.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 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
 +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
      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
  
  
@@@ -858,138 -633,138 +858,138 @@@
  
  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 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 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 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 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 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
 -    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 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
  
  
  # +-------------------+
@@@ -999,84 -774,40 +999,84 @@@
  
  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 info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
 -#~#     #HostName 138.231.36.60
 -#~#     HostName ssh.dptinfo.ens-cachan.fr
 -#~#     User loginENS
 -#~#     ForwardAgent yes
 -#~# 
 -#~# # Le ! permet de ne pas capturer ssh.dptinfo dans *.dptinfo
 -#~# # Sinon on crée une boucle
 -#~# Host *.dptinfo !ssh.dptinfo
 -#~#     HostName %h.ens-cachan.fr
 -#~#     User loginENS
 -#~#     ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr
 -#~#     HostName %h
 -#~#     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 info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
 +    #HostName 138.231.36.60
 +    HostName ssh.dptinfo.ens-cachan.fr
 +    User vlegalli
 +    ForwardAgent yes
 +
 +# Le ! permet de ne pas capturer ssh.dptinfo dans *.dptinfo
 +# Sinon on crée une boucle
 +Host *.dptinfo !ssh.dptinfo
 +    HostName %h.ens-cachan.fr
 +    User vlegalli
 +    ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p
 +    ForwardAgent yes
 +
 +Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr
 +    HostName %h
 +    User vlegalli
 +    ProxyCommand ssh loginENS@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.30.228
 +    HostName 129.175.30.228
 +    User vincent
 +    ForwardAgent yes
 +    ProxyCommand ssh pl-ssh.lri.fr -W %h:%p
 +
  # END (utile pour éviter les merge conflicts)