X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=.ssh%2Fconfig;h=1d7ee1315c11c88a95c62cab1425078387f3d7b8;hb=e5aeb844cb4086b80a851f66fab79959d12daff0;hp=6f63e5086ca45849976c40a40a68ea6d9ba9f506;hpb=8f36d01580c5bd91b5a33d39a74139a922938361;p=config-20-100.git

diff --git a/.ssh/config b/.ssh/config
index 6f63e50..1d7ee13 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 login 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,14 +49,40 @@ VerifyHostKeyDNS yes
 # ProxyCommand = pour passer par un autre serveur intermédiaire
 #                (pour un serveur qui ne peut pas être contacté directement)
 
-# +-----------------+
-# | Machines du BDE |
-# +-----------------+
-
-Host kfet kfet.crans.org kfet1
-    HostName kfet.crans.org
-    User bde
-
+#~# # +-----------------+
+#~# # | Serveurs du BDE |
+#~# # +-----------------+
+#~# # Serveurs du BDE accessible 
+#~# # aux respos info
+#~# 
+#~# Host kfet kfet.crans.org kfet1
+#~#     HostName kfet.crans.org
+#~#     User root
+#~# 
+#~# Host bde2 bde2-virt note note-virt kfet-ics doc-bde ldap-bde
+#~#     HostName bde2-virt.crans.org
+#~#     User loginBDE
+#~#     ForwardAgent yes
+#~# 
+#~# Host  bde3-virt digicode
+#~#     HostName bde3-virt.crans.org
+#~#     User loginBDE
+#~#     ForwardAgent yes
+#~# 
+#~# Host  bde3 
+#~#     HostName bde3.crans.org
+#~#     User loginBDE
+#~#     ForwardAgent yes
+#~# 
+#~# Host bde-test bde-test-virt note-test note-dev
+#~#     HostName bde-test-virt.crans.org
+#~#     User loginBDE
+#~#     ForwardAgent yes
+#~# 
+#~# Host video-bde sauron
+#~#     HostName sauron.crans.org
+#~#     User loginBDE
+#~#     ForwardAgent yes
 
 # +-------------------+
 # | Serveurs du Cr@ns |
@@ -55,45 +90,115 @@ Host kfet kfet.crans.org kfet1
 # Accessible aux apprentis
 # sauf zamok et ssh2, accessibles à tous les adhérents
 
-Host appartement appartement.crans.org
+Host alice alice.crans.org
+    HostName alice.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host alice.adm alice.adm.crans.org
+    HostName alice.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host appartement hackpartement appartement.crans.org hackpartement.crans.org
     HostName appartement.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host apprentis apprentis.crans.org
+Host apprentis munin-apprentis apprentis.crans.org munin-apprentis.crans.org
     HostName apprentis.crans.org
     User loginCr@ns
 
-Host asterisk sip asterisk.adm.crans.org asterisk.crans.org sip.crans.org
+Host asterisk sip stun voip asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org
     HostName asterisk.crans.org
     User loginCr@ns
     ForwardAgent yes
 
+Host asterisk.adm asterisk.adm.crans.org
+    HostName asterisk.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host backbone backbone.crans.org
+    HostName backbone.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host backbone.adm backbone.adm.crans.org
+    HostName backbone.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host bakdaur bakdaur.crans.org
+    HostName bakdaur.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host bakdaur.adm bakdaur.adm.crans.org
+    HostName bakdaur.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host backbone.wifi backbone.wifi.crans.org
+    HostName backbone.wifi.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host batk-0 batk-0.crans.org
     HostName batk-0.crans.org
     User loginCr@ns
 
-Host canard canard.ferme.crans.org canard.adm.crans.org
-    HostName canard.ferme.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 loginCr@ns
     ForwardAgent yes
 
-Host cas auth login cas.adm.crans.org cas.crans.org login.crans.org auth.crans.org
-    HostName cas.crans.org
+Host cas.adm cas.adm.crans.org
+    HostName cas.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host charybde darcs ftp git 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 git.crans.org darcs.crans.org charybde.adm.crans.org ftp.adm.crans.org mirror.adm.crans.org ntp.adm.crans.org git.adm.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
     ForwardAgent yes
 
-Host cochon cochon.ferme.crans.org cochon.adm.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 loginCr@ns
+    ForwardAgent yes
+
+Host civet rabbitmq vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
+    HostName civet.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
+    HostName civet.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host cochon.adm cochon.adm.crans.org
+    HostName cochon.adm.crans.org
+    User loginCr@ns
+    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
     ForwardAgent yes
 
-Host dhcp dhcp.adm.crans.org dhcp.crans.org
+Host cups cups.crans.org
+    HostName cups.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host cups.adm cups.adm.crans.org
+    HostName cups.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host dhcp dhcp.crans.org
     HostName dhcp.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -103,52 +208,142 @@ Host dhcp-21 dhcp-21.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host dindon dindon.ferme.crans.org dindon.adm.crans.org
-    HostName dindon.ferme.crans.org
+Host dhcp.adm dhcp.adm.crans.org
+    HostName dhcp.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host dyson munin nagios dyson.crans.org munin.crans.org nagios.crans.org dyson.adm.crans.org munin.adm.crans.org
+Host discourse discourse-srv discourse.crans.org discourse-srv.crans.org
+    HostName discourse-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host dyson dyson.crans.org
     HostName dyson.crans.org
     User loginCr@ns
     ForwardAgent yes
 
+Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
+    HostName dyson.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host ethercalc ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org
+    HostName ethercalc-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host ethercalc.adm ethercalc.adm.crans.org
+    HostName ethercalc.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host freebox freebox.crans.org
     HostName freebox.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host gordon nectaris ragnarok vpn wifi-update gordon.wifi.crans.org wifi-update.crans.org nectaris.wifi.crans.org vpn.crans.org ragnarok.wifi.crans.org gordon.crans.org gordon.adm.crans.org
-    HostName gordon.crans.org
+Host frontdaur frontdaur.crans.org
+    HostName frontdaur.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host irc qwebirc web-irc irc.crans.org web-irc.crans.org qwebirc.crans.org irc.adm.crans.org
+Host frontdaur.adm frontdaur.adm.crans.org
+    HostName frontdaur.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host ft ft.crans.org
+    HostName ft.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host ft.adm ft.adm.crans.org
+    HostName ft.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host fy munin icinga2 weathermap fy.crans.org munin.crans.org icinga2.crans.org weathermap.crans.org
+    HostName fy.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host fy.adm fy.adm.crans.org
+    HostName fy.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host fz fz.crans.org
+    HostName fz.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host fz.adm fz.adm.crans.org
+    HostName fz.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
+    HostName geet.crans.org
+    User loginCr@ns
+    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
+    ForwardAgent yes
+
+Host horde horde-srv webmail horde.crans.org horde-srv.crans.org webmail.crans.org
+    HostName horde-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host horde.adm horde.adm.crans.org
+    HostName horde.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host irc qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
     HostName irc.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host isc isc.crans.org isc.adm.crans.org
+Host irc.adm irc.adm.crans.org
+    HostName irc.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host isc isc.crans.org
     HostName isc.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host jouvence poulet jouvence.crans.org poulet.ferme.crans.org jouvence.adm.crans.org poulet.adm.crans.org
-    HostName poulet.ferme.crans.org
+Host isc.adm isc.adm.crans.org
+    HostName isc.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host kdell kdell.adm.crans.org kdell.crans.org
+Host kdell kdell.crans.org
     HostName kdell.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host kenobi infinoted kenobby laval obby kenobi.crans.org obby.crans.org kenobby.crans.org infinoted.crans.org laval.crans.org kenobi.adm.crans.org
+Host kdell.adm kdell.adm.crans.org
+    HostName kdell.adm.crans.org
+    User loginCr@ns
+    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
     ForwardAgent yes
 
-Host komaz komaz.crans.org komaz.adm.crans.org komaz.wifi.crans.org
+Host kenobi.adm kenobi.adm.crans.org
+    HostName kenobi.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host komaz komaz.crans.org
     HostName komaz.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -158,77 +353,192 @@ Host komaz-21 komaz-21.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host lapin lapin.ferme.crans.org lapin.adm.crans.org
-    HostName lapin.ferme.crans.org
+Host komaz.adm komaz.adm.crans.org
+    HostName komaz.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host malloc malloc.crans.org malloc.adm.crans.org
+Host malloc malloc.crans.org
     HostName malloc.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host mdr television vache mdr.crans.org television.crans.org vache.ferme.crans.org mdr.adm.crans.org vache.adm.crans.org
-    HostName vache.ferme.crans.org
+Host malloc.adm malloc.adm.crans.org
+    HostName malloc.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host nat64 nat64.adm.crans.org nat64.crans.org
+Host mediadrop mediadrop-srv video mediadrop.crans.org video.crans.org mediadrop-srv.crans.org video-srv.crans.org
+    HostName mediadrop-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host mediadrop.adm mediadrop.adm.crans.org
+    HostName mediadrop.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host nat64 nat64.crans.org
     HostName nat64.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host nem nem.crans.org nem.adm.crans.org
+Host nat64.adm nat64.adm.crans.org
+    HostName nat64.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host nem nem.crans.org
     HostName nem.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host news web-news webnews news.crans.org web-news.crans.org webnews.crans.org news.adm.crans.org webnews.adm.crans.org web-news.adm.crans.org
+Host nem.adm nem.adm.crans.org
+    HostName nem.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host news web-news webnews news.crans.org web-news.crans.org webnews.crans.org
     HostName news.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host niomniom autostatus ca doc federez i-p install-party map webalizer wifi wiki wikipedia www niomniom.adm.crans.org 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 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
+    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
     ForwardAgent yes
 
-Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org o2.adm.crans.org
+Host niomniom.adm niomniom.adm.crans.org
+    HostName niomniom.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org
     HostName o2.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host oie oie.ferme.crans.org oie.adm.crans.org
-    HostName oie.ferme.crans.org
+Host o2.adm o2.adm.crans.org
+    HostName o2.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host odlyd odlyd.crans.org
+    HostName odlyd.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host ovh msn ovh.crans.org msn.crans.org ovh.adm.crans.org
-    HostName ovh.crans.org
+Host odlyd.adm upload.adm odlyd.adm.crans.org upload.adm.crans.org
+    HostName odlyd.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host owl imap pop roundcube roundcube2 webmail owl.adm.crans.org owl.crans.org pop.crans.org imap.crans.org webmail.crans.org roundcube2.crans.org roundcube.crans.org
+Host odlyd.wifi odlyd.wifi.crans.org
+    HostName odlyd.wifi.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host oie oie oie.ferme oie.crans.org oie.ferme.crans.org
+    HostName oie.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host oie.adm oie.adm.crans.org
+    HostName oie.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host omnomnom omnomnom.crans.org
+    HostName omnomnom.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host omnomnom.adm omnomnom.adm.crans.org
+    HostName omnomnom.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
     HostName owl.crans.org
     User loginCr@ns
     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
+    ForwardAgent yes
+
+Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org
+    HostName owncloud-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host owncloud.adm owncloud.adm.crans.org
+    HostName owncloud.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host pea pea.crans.org
+    HostName pea.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host pea.adm pea.adm.crans.org
+    HostName pea.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host pegase pegase.crans.org
     HostName pegase.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host puppet puppet.adm.crans.org puppet.crans.org
+Host proxy proxy.crans.org
+    HostName proxy.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host puppet puppet.crans.org
     HostName puppet.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host redisdead lists smtp redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org redisdead.crans.org lists.crans.org smtp.crans.org
+Host puppet.adm puppet.adm.crans.org
+    HostName puppet.adm.crans.org
+    User loginCr@ns
+    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
     ForwardAgent yes
 
-Host routeur deconnexion routeur.adm.crans.org routeur.crans.org deconnexion.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 loginCr@ns
+    ForwardAgent yes
+
+Host rezosup rezosup.crans.org
+    HostName rezosup.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host roundcube roundcube-srv roundcube.crans.org roundcube-srv.crans.org
+    HostName roundcube-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host roundcube.adm roundcube.adm.crans.org
+    HostName roundcube.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host routeur deconnexion routeur.crans.org deconnexion.crans.org
     HostName routeur.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -238,22 +548,42 @@ Host routeur-21 routeur-21.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host sable dns proxy sable.crans.org proxy.crans.org dns.crans.org sable.adm.crans.org proxy.adm.crans.org
+Host routeur.adm routeur.adm.crans.org
+    HostName routeur.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host sable dns sable.crans.org dns.crans.org
     HostName sable.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host schrodingred schrodingred.crans.org schrodingred.adm.crans.org
-    HostName schrodingred.crans.org
+Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org
+    HostName sable.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org
+    HostName sogo-srv.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host sogo.adm sogo.adm.crans.org
+    HostName sogo.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host sogo sogo.crans.org sogo.adm.crans.org
-    HostName sogo.crans.org
+Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
+    HostName soyouz.crans.org
     User loginCr@ns
     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 loginCr@ns
+    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
@@ -261,168 +591,197 @@ Host ssh2 ssh2.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host template template.crans.org template.adm.crans.org
-    HostName template.crans.org
+Host stitch stitch.crans.org
+    HostName stitch.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host thot pgsql psuornotpsu thot.crans.org psuornotpsu.crans.org thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org
-    HostName thot.crans.org
+Host stitch.adm stitch.adm.crans.org
+    HostName stitch.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host titanic titanic.crans.org titanic.adm.crans.org
-    HostName titanic.crans.org
+Host stun-secondary stun-secondary.crans.org
+    HostName stun-secondary.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host titanic-21 titanic-21.crans.org
-    HostName titanic-21.crans.org
+Host template template.crans.org
+    HostName template.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host tracker todo tracker.crans.org todo.crans.org tracker.adm.crans.org
-    HostName tracker.crans.org
+Host template.adm template.adm.crans.org
+    HostName template.adm.crans.org
     User loginCr@ns
     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 vo.adm.crans.org
-    HostName vo.crans.org
+Host test1 test1.crans.org
+    HostName test1.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host xmpp aim chat conference 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 xmpp.adm.crans.org jabber.adm.crans.org
-    HostName xmpp.crans.org
+Host test2 test2.crans.org
+    HostName test2.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host ytrap-llatsni ytrap-llatsni.crans.org ytrap-llatsni.adm.crans.org
-    HostName ytrap-llatsni.crans.org
+Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
+    HostName thot.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host zamok accounts bda-paris bleu blogs factures impression intranet mysql perso ssh users 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 zamok.adm.crans.org bleu.adm.crans.org impression.adm.crans.org users.adm.crans.org
-    HostName zamok.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 loginCr@ns
     ForwardAgent yes
 
+Host titanic titanic.crans.org
+    HostName titanic.crans.org
+    User loginCr@ns
+    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 titanic.adm titanic.adm.crans.org
+    HostName titanic.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
 
-Host alice alice.adm.crans.org
-    HostName alice.adm.crans.org
+Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
+    HostName tracker.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host babar babar.adm.crans.org
-    HostName babar.adm.crans.org
+Host tracker.adm tracker.adm.crans.org
+    HostName tracker.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host bcfg2 bcfg2.adm.crans.org
-    HostName bcfg2.adm.crans.org
+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
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host daath daath.adm.crans.org
-    HostName daath.adm.crans.org
+Host vo-eth0 vo-eth0.crans.org
+    HostName vo-eth0.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host eap eap.adm.crans.org
-    HostName eap.adm.crans.org
+Host vo.adm vo.adm.crans.org
+    HostName vo.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host fx-ilo zamok-ilo fx-ilo.adm.crans.org zamok-ilo.adm.crans.org
-    HostName fx-ilo.adm.crans.org
+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
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
-    HostKeyAlgorithms ssh-rsa
 
-Host fy fy.adm.crans.org
-    HostName fy.adm.crans.org
+Host xmpp.adm jabber.adm xmpp.adm.crans.org jabber.adm.crans.org
+    HostName xmpp.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host fy-ilo fy-ilo.adm.crans.org
-    HostName fy-ilo.adm.crans.org
+Host ytrap-llatsni ytrap-llatsni.crans.org
+    HostName ytrap-llatsni.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
-    HostKeyAlgorithms ssh-rsa
 
-Host fz fz.adm.crans.org
-    HostName fz.adm.crans.org
+Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
+    HostName ytrap-llatsni.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host fz-ilo fz-ilo.adm.crans.org
-    HostName fz-ilo.adm.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 bde.crans.org pot-vieux.crans.org
+    HostName zamok.crans.org
+    User loginCr@ns
+    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
+    ForwardAgent yes
+
+
+# +-------------------------+
+# | Serveurs Cr@ns adm-only |
+# +-------------------------+
+# Accessibles aux apprentis, mais ne sont que sur le VLAN adm
+# d'où la ProxyCommand
+
+Host babar.adm babar babar babar.adm.crans.org
+    HostName babar.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
-    HostKeyAlgorithms ssh-rsa
 
-Host kdell-idrac kdell-idrac.adm.crans.org
-    HostName kdell-idrac.adm.crans.org
+Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
+    HostName bcfg2.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host komaz-ilo komaz-ilo.adm.crans.org
-    HostName komaz-ilo.adm.crans.org
+Host eap.adm eap eap eap.adm.crans.org
+    HostName eap.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
-    HostKeyAlgorithms ssh-rsa
 
-Host radius radius.adm.crans.org
+Host kdell-idrac.adm kdell-idrac kdell-idrac kdell-idrac.adm.crans.org
+    HostName kdell-idrac.adm.crans.org
+    User root
+    ProxyCommand ssh sable.crans.org -W %h:%p
+
+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
     HostName radius.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host sable-ilo sable-ilo.adm.crans.org
+Host sable-ilo.adm sable-ilo sable-ilo sable-ilo.adm.crans.org
     HostName sable-ilo.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
     HostKeyAlgorithms ssh-rsa
 
-Host slon slon.adm.crans.org
+Host slon.adm slon slon slon.adm.crans.org
     HostName slon.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host vert ldap zelda vert.adm.crans.org ldap.adm.crans.org zelda.adm.crans.org
+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
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host zbee fx nfs zbee.adm.crans.org nfs.adm.crans.org fx.adm.crans.org
-    HostName zbee.adm.crans.org
+Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
+    HostName zbee-idrac.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host zbee-idrac zbee-idrac.adm.crans.org
-    HostName zbee-idrac.adm.crans.org
+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
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
@@ -433,6 +792,7 @@ Host zbee-idrac zbee-idrac.adm.crans.org
 #~# # +---------+
 #~# # 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
@@ -442,6 +802,21 @@ Host zbee-idrac zbee-idrac.adm.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
 
 
 # +-------------------+
@@ -452,6 +827,7 @@ Host zbee-idrac zbee-idrac.adm.crans.org
 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
 
 Host tahines.ens-cachan.fr tahines2 tahines
     HostName tahines.ens-cachan.fr
@@ -464,20 +840,22 @@ Host tahines.ens-cachan.fr tahines2 tahines
 #~# # 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 loginENS
 #~#     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 loginENS
 #~#     ProxyCommand ssh loginENS@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 loginENS
 #~#     ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
 #~#     ForwardAgent yes