X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=blobdiff_plain;f=.ssh%2Fconfig;h=439617c95949cca2ae71fc9cb6bfda1aa68f26a8;hp=8bdf8a889357f3c36ee87054c205abbddfb3ec68;hb=3110179d496d7675dccb8e477016607370e72521;hpb=dfd9751a9273b8ce1b03cd26d2b7c35b99643017

diff --git a/.ssh/config b/.ssh/config
index 8bdf8a8..439617c 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -2,7 +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
+# 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
@@ -10,11 +10,12 @@
 
 # À noter que la plupart des serveurs présents dedans sont des serveurs
 # du Cr@ns, qui risquent donc d'intéresser essentiellement des membres actifs.
-# Pensez à remplacer "loginCr@ns", "loginFedeRez" et "loginENS" par les login idoines
+# Pensez à remplacer "loginCr@ns", "loginFedeRez", "loginBDE" et "loginENS" par
+# les logins idoines.
 
 #------------------------------------------------------------------------------
 
-# 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,14 +23,22 @@ Compression yes
 #~# # 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
+
 # Les options suivantes apparaissent dans les blocs
 # Host = commence un bloc avec les noms qui utiliseront ce bloc
 # HostName = nom réellement utilisé pour se connecter au serveur (ou son IP)
@@ -40,11 +49,17 @@ VerifyHostKeyDNS yes
 # ProxyCommand = pour passer par un autre serveur intermédiaire
 #                (pour un serveur qui ne peut pas être contacté directement)
 
+UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_hosts_dptinfo ~/.ssh/known_hosts_telecom_serveurs ~/.ssh/known_hosts_telecom_tp
 
 # +--------------+
 # | Mes machines |
 # +--------------+
 
+Host zeldren.crans.org zeldren
+    HostName zeldren.crans.org
+    User vincent
+    ForwardAgent yes
+
 Host cerebro.crans.org cerebro
     HostName cerebro.crans.org
     User vincent
@@ -53,20 +68,72 @@ Host cerebro.crans.org cerebro
 Host eva.crans.org eva eeepc
     HostName eva.crans.org
     User vincent
-    ForwardX11 yes
     ForwardAgent yes
 
-Host cabal.crans.org cabal
+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
-    ForwardX11 yes
     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
@@ -109,59 +176,14 @@ Host ibot iBot
 # +--------+
 # | Pimeys |
 # +--------+
-# Serveur dédié ovh
-# pimeys.fr = 176.31.106.206
+# Serveur dédié online.net
+# pimeys.fr = 62.210.178.115
 
-Host pimeys pimeys.fr
+Host pimeys pimeys.fr becue.eu
     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 |
@@ -186,47 +208,95 @@ Host ruoska ruoska.crans.org
 # +-----+
 # Parce que j'y suis le bienvenu
 
-# Le ftp de Nit, gère A♡-TV. 
+# Le ftp de Nit
 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
+# Parce que le département A♡ a un serveur
 
 Host acoeur acoeur.crans.org
     HostName acoeur.crans.org
     User vincent
     ForwardAgent yes
 
+
+# +-----------------+
+# | Serveurs du BDE |
+# +-----------------+
+# Serveurs du BDE accessibles aux respos info
+
+Host kfet kfet.crans.org kfet1
+    HostName kfet.crans.org
+    User bde
+    ForwardAgent yes
+
+Host kfet-bureau kfet-bureau.crans.org bureau bureau-bde
+    HostName kfet.crans.org
+    User bde
+    ForwardAgent yes
+
+Host bde2 bde2-virt note note-virt kfet-ics doc-bde ldap-bde bde2.crans.org bde2-virt.crans.org note.crans.org
+    HostName bde2-virt.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host bde3-virt digicode bde3-virt.crans.org
+    HostName bde3-virt.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host bde3 bde3.crans.org
+    HostName bde3.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host bde-test bde-test-virt note-test note-dev bde-test.crans.org bde-test-virt.crans.org note-test.crans.org
+    HostName bde-test-virt.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host sauron sauron.crans.org
+    HostName sauron.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host med zavoyarde med.crans.org zavoyarde.crans.org
+    HostName zavoyarde.crans.org
+    User vincent
+    ForwardAgent yes
+
+
 # +-------------------+
 # | Serveurs du Cr@ns |
 # +-------------------+
 # 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 legallic
+    ForwardAgent yes
+
+Host alice.adm alice.adm.crans.org
+    HostName alice.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host appartement hackpartement appartement.crans.org hackpartement.crans.org
     HostName appartement.crans.org
     User legallic
     ForwardAgent yes
 
-Host apprentis apprentis.crans.org
+Host apprentis munin-apprentis apprentis.crans.org munin-apprentis.crans.org
     HostName apprentis.crans.org
     User 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 legallic
     ForwardAgent yes
@@ -246,27 +316,27 @@ Host backbone.adm backbone.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host backbone.wifi backbone.wifi.crans.org
-    HostName backbone.wifi.crans.org
+Host bakdaur bakdaur.crans.org
+    HostName bakdaur.crans.org
     User legallic
     ForwardAgent yes
 
-Host batk-0 batk-0.crans.org
-    HostName batk-0.crans.org
+Host bakdaur.adm bakdaur.adm.crans.org
+    HostName bakdaur.adm.crans.org
     User legallic
+    ForwardAgent yes
 
-Host canard.adm canard.adm.crans.org
-    HostName canard.adm.crans.org
+Host backbone.wifi backbone.wifi.crans.org
+    HostName backbone.wifi.crans.org
     User legallic
     ForwardAgent yes
 
-Host canard.ferme canard canard.ferme.crans.org
-    HostName canard.ferme.crans.org
+Host batk-0 batk-0.crans.org
+    HostName batk-0.crans.org
     User legallic
-    ForwardAgent yes
 
-Host cas auth login cas.crans.org login.crans.org auth.crans.org
-    HostName cas.crans.org
+Host cas cas-srv auth login cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
+    HostName cas-srv.crans.org
     User legallic
     ForwardAgent yes
 
@@ -280,18 +350,18 @@ Host charybde darcs ftp ftp.crans.ens-cachan.fr karibe mirror ntp xn--hxamgu1bpk
     User legallic
     ForwardAgent yes
 
-Host git git.crans.org
-    HostName geet.crans.org
+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 legallic
     ForwardAgent yes
 
-Host charybde.adm ftp.adm git.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.adm.crans.org mirror.adm.crans.org ntp.adm.crans.org git.adm.crans.org
-    HostName charybde.adm.crans.org
+Host civet rabbitmq vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
+    HostName civet.crans.org
     User legallic
     ForwardAgent yes
 
-Host civet.crans.org civet
-    HostName civet.crans.org
+Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
+    HostName civet.adm.crans.org
     User legallic
     ForwardAgent yes
 
@@ -300,11 +370,21 @@ Host cochon.adm cochon.adm.crans.org
     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 legallic
     ForwardAgent yes
 
+Host cups cups.crans.org
+    HostName cups.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host cups.adm cups.adm.crans.org
+    HostName cups.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host dhcp dhcp.crans.org
     HostName dhcp.crans.org
     User legallic
@@ -320,17 +400,12 @@ Host dhcp.adm dhcp.adm.crans.org
     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
+Host discourse discourse-srv discourse.crans.org discourse-srv.crans.org
+    HostName discourse-srv.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 legallic
     ForwardAgent yes
@@ -340,37 +415,72 @@ Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host ethercalc ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org
+    HostName ethercalc-srv.crans.org
+    User legallic
+    ForwardAgent yes
+
+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 legallic
     ForwardAgent yes
 
-Host geet.crans.org git.crans.org geet git
-    HostName geet.crans.org
+Host frontdaur frontdaur.crans.org
+    HostName frontdaur.crans.org
     User legallic
     ForwardAgent yes
 
-Host geet.adm.crans.org git.adm.crans.org geet.adm git.adm
-    HostName geet.adm.crans.org
+Host frontdaur.adm frontdaur.adm.crans.org
+    HostName frontdaur.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host ft ft.crans.org
+    HostName ft.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host ft.adm ft.adm.crans.org
+    HostName ft.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host fy munin icinga2 weathermap fy.crans.org munin.crans.org icinga2.crans.org weathermap.crans.org
+    HostName fy.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host fy.adm fy.adm.crans.org
+    HostName fy.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host gordon gordon.crans.org
-    HostName gordon.crans.org
+Host fz fz.crans.org
+    HostName fz.crans.org
     User legallic
     ForwardAgent yes
 
-Host gordon.adm gordon.adm.crans.org
-    HostName gordon.adm.crans.org
+Host fz.adm fz.adm.crans.org
+    HostName fz.adm.crans.org
     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 geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
+    HostName geet.crans.org
+    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 legallic
     ForwardAgent yes
 
-Host horde horde.crans.org
+Host horde horde-srv webmail horde.crans.org horde-srv.crans.org webmail.crans.org
     HostName horde.crans.org
     User legallic
     ForwardAgent yes
@@ -380,7 +490,7 @@ Host horde.adm horde.adm.crans.org
     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 legallic
     ForwardAgent yes
@@ -400,16 +510,6 @@ Host isc.adm isc.adm.crans.org
     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 legallic
@@ -420,7 +520,7 @@ Host kdell.adm kdell.adm.crans.org
     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 legallic
     ForwardAgent yes
@@ -445,21 +545,6 @@ Host komaz.adm komaz.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host komaz.wifi komaz.wifi.crans.org
-    HostName komaz.wifi.crans.org
-    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 legallic
@@ -470,13 +555,13 @@ Host malloc.adm malloc.adm.crans.org
     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 mediadrop-srv video mediadrop.crans.org video.crans.org mediadrop-srv.crans.org video-srv.crans.org
+    HostName mediadrop.crans.org
     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 legallic
     ForwardAgent yes
 
@@ -510,7 +595,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org
     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 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 legallic
     ForwardAgent yes
@@ -530,41 +615,81 @@ Host o2.adm o2.adm.crans.org
     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 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 legallic
     ForwardAgent yes
 
-Host ovh msn ovh.crans.org msn.crans.org
-    HostName ovh.crans.org
+Host odlyd.wifi odlyd.wifi.crans.org
+    HostName odlyd.wifi.crans.org
     User legallic
     ForwardAgent yes
 
-Host ovh.adm ovh.adm.crans.org
-    HostName ovh.adm.crans.org
+Host oie oie oie.ferme oie.crans.org oie.ferme.crans.org
+    HostName oie.crans.org
     User legallic
     ForwardAgent yes
 
-Host owl imap pop webmail owl.crans.org pop.crans.org imap.crans.org webmail.crans.org
+Host oie.adm oie.adm.crans.org
+    HostName oie.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host omnomnom omnomnom.crans.org
+    HostName omnomnom.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host omnomnom.adm omnomnom.adm.crans.org
+    HostName omnomnom.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
     HostName owl.crans.org
     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 legallic
     ForwardAgent yes
 
+Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org
+    HostName owncloud.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host owncloud.adm owncloud.adm.crans.org
+    HostName owncloud.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host pea pea.crans.org
+    HostName pea.crans.org
+    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 legallic
     ForwardAgent yes
 
+Host proxy proxy.crans.org
+    HostName proxy.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host puppet puppet.crans.org
     HostName puppet.crans.org
     User legallic
@@ -575,16 +700,21 @@ Host puppet.adm puppet.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host redisdead lists smtp redisdead.crans.org lists.crans.org smtp.crans.org
+Host redisdead list liste listes lists smtp redisdead.crans.org lists.crans.org smtp.crans.org liste.crans.org listes.crans.org list.crans.org
     HostName redisdead.crans.org
     User legallic
     ForwardAgent yes
 
-Host redisdead.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org
+Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org listes.adm.crans.org list.adm.crans.org liste.adm.crans.org
     HostName redisdead.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host rezosup rezosup.crans.org
+    HostName rezosup.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host roundcube roundcube.crans.org
     HostName roundcube.crans.org
     User legallic
@@ -610,7 +740,7 @@ Host routeur.adm routeur.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host sable dns proxy sable.crans.org proxy.crans.org dns.crans.org
+Host sable dns sable.crans.org dns.crans.org
     HostName sable.crans.org
     User legallic
     ForwardAgent yes
@@ -620,17 +750,7 @@ Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org
     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
+Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org
     HostName sogo.crans.org
     User legallic
     ForwardAgent yes
@@ -641,11 +761,16 @@ Host sogo.adm sogo.adm.crans.org
     ForwardAgent yes
 
 Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
-    HostName soyoustart.crans.org
-    HostName legallic
+    HostName soyouz.crans.org
+    User legallic
     ForwardAgent yes
 
-Host ssh2 ssh2.crans.org
+Host soyouz.adm soyoustart.adm soyouz.adm.crans.org soyoustart.adm.crans.org
+    HostName soyouz.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host ssh2 mosh ssh2.crans.org mosh.crans.org
     # Un serveur ssh qui n'est qu'un nat vers 138.231.136.1:22
     # pour passer à travers les blocages de ports (443 = https)
     HostName 138.231.136.2
@@ -653,6 +778,21 @@ Host ssh2 ssh2.crans.org
     User legallic
     ForwardAgent yes
 
+Host stitch stitch.crans.org
+    HostName stitch.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host stitch.adm stitch.adm.crans.org
+    HostName stitch.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
+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 legallic
@@ -663,12 +803,22 @@ Host template.adm template.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host thot psuornotpsu thot.crans.org psuornotpsu.crans.org
+Host test1 test1.crans.org
+    HostName test1.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host test2 test2.crans.org
+    HostName test2.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
     HostName thot.crans.org
     User legallic
     ForwardAgent yes
 
-Host thot.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org
+Host thot.adm logs.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org logs.adm.crans.org
     HostName thot.adm.crans.org
     User legallic
     ForwardAgent yes
@@ -683,7 +833,7 @@ Host titanic.adm titanic.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host tracker todo tracker.crans.org todo.crans.org
+Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
     HostName tracker.crans.org
     User legallic
     ForwardAgent yes
@@ -698,6 +848,11 @@ Host vo calendrier intranet-dev news-dev openid-dev weavesync vo.crans.org weave
     User legallic
     ForwardAgent yes
 
+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 legallic
@@ -723,7 +878,7 @@ Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
     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 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 legallic
     ForwardAgent yes
@@ -733,25 +888,12 @@ Host zamok.adm bleu.adm impression.adm users.adm zamok.adm.crans.org bleu.adm.cr
     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 |
 # +-------------------------+
 # Accessibles aux apprentis, mais ne sont que sur le VLAN adm
 # d'où la ProxyCommand
-# fy et fz ne sont accessibles qu'aux nounous
-
-Host alice.adm alice alice alice.adm.crans.org
-    HostName alice.adm.crans.org
-    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
@@ -765,80 +907,33 @@ Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
     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 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 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 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 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 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 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 legallic
-    ForwardAgent yes
+    User root
     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 legallic
-    ForwardAgent yes
+Host *-ilo
+    HostName %h.adm.crans.org
+    User Administrator
+    PasswordAuthentication yes
+    ChallengeResponseAuthentication no
+    GSSAPIAuthentication no
+    HostbasedAuthentication no
+    PubkeyAuthentication no
+    RSAAuthentication no
+    Compression no
+    ForwardAgent no
+    ForwardX11 no
+    KexAlgorithms diffie-hellman-group1-sha1
+    MACs hmac-md5,hmac-sha1
+    Ciphers aes128-cbc,3des-cbc
+    HostKeyAlgorithms ssh-rsa,ssh-dss
     ProxyCommand ssh sable.crans.org -W %h:%p
 
 Host radius.adm radius radius radius.adm.crans.org
@@ -860,12 +955,6 @@ Host slon.adm slon slon slon.adm.crans.org
     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 legallic
@@ -890,33 +979,52 @@ Host zbee.adm fx.adm nfs.adm zbee zbee zbee.adm.crans.org nfs.adm.crans.org fx.a
 # +---------+
 # 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
+Host hexagon hexagon.federez.net
+    HostName hexagon.federez.net
     User legallic
     ForwardAgent yes
 
-Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
-    HostName baldrick.federez.net
+Host quigon quigon.federez.net
+    HostName quigon.federez.net
     User legallic
     ForwardAgent yes
 
-Host quigon quigon.federez.net
-    HostName quigon.federez.net
+Host nonagon nonagon.federez.net
+    HostName nonagon.federez.net
     User legallic
     ForwardAgent yes
 
-Host polygon polygon.federez.net
-    HostName polygon.federez.net
+Host octogon octogon.federez.net
+    HostName octogon.federez.net
     User legallic
     ForwardAgent yes
 
-Host hexagon hexagon.federez.net
-    HostName hexagon.federez.net
+Host pentagon pentagon.federez.net
+    HostName pentagon.federez.net
+    User legallic
+    ForwardAgent yes
+
+Host parangon parangon.federez.net
+    HostName parangon.federez.net
+    User legallic
+    ForwardAgent yes
+
+Host federez-test federez-test.federez.net
+    HostName federez-test.federez.net
     User legallic
     ForwardAgent yes
 
 
+# +---------+
+# | RezoSup |
+# +---------+
+# Réseau IRC des grandes écoles
+
+Host oswaft oswaft.rezosup.net
+    HostName oswaft.rezosup.net
+    User vincent
+    ForwardAgent yes
+
 # +-------------------+
 # | Serveurs de l'ENS |
 # +-------------------+
@@ -937,54 +1045,28 @@ Host tahines.ens-cachan.fr tahines2 tahines
     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
+Host info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
     #HostName 138.231.36.60
     HostName ssh.dptinfo.ens-cachan.fr
     User vlegalli
     ForwardAgent yes
 
-Host dptinfo*.dptinfo.ens-cachan.fr
-    HostName %h
+# 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 info*
-    HostName dpt%h.dptinfo.ens-cachan.fr
+Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr
+    HostName %h
     User vlegalli
     ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p
     ForwardAgent yes
@@ -993,6 +1075,7 @@ Host info*
 # +--------+
 # | Stages |
 # +--------+
+
 Host mars mars.lbpa mars.lbpa.ens-cachan.fr
     HostName mars.lbpa.ens-cachan.fr
     User vincent