SSH zeldren

[config-20-100.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 8aac39dfcf246bc558ef7b1de01a0382f1d5d357..439617c95949cca2ae71fc9cb6bfda1aa68f26a8 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -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,12 +23,12 @@ 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
@@ -48,11 +49,17 @@ ServerAliveCountMax 3
 # 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
@@ -64,7 +71,7 @@ Host eva.crans.org eva eeepc
     ForwardAgent yes
 
 Host eva.local
-    HostName 192.168.1.79
+    HostName 192.168.1.12
     User vincent
     ForwardAgent yes
 
@@ -74,7 +81,7 @@ Host evaw.local
     ForwardAgent yes
 
 Host eva.home evaf
-    HostName 192.168.1.79
+    HostName 192.168.1.12
     User vincent
     ForwardAgent yes
     ProxyCommand ssh home.b2moo.fr -W %h:%p
@@ -178,51 +185,6 @@ Host pimeys pimeys.fr becue.eu
     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
-    # IPv4 only
-    AddressFamily inet
-
-Host kfet2 kfet2.crans.org
-    HostName kfet2.crans.org
-    User vincent
-
-Host old-note old-note.crans.org
-    HostName old-note.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host note bde2 note2 note.crans.org bde2.crans.org note2.crans.org
-    HostName note.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
-
-Host vieux vm-vieux pot-vieux vieux.crans.org pot-vieux.crans.org
-    HostName vieux.crans.org
-    User vincent
-    ForwardAgent yes
-
-
 # +----+
 # | PE |
 # +----+
@@ -246,31 +208,69 @@ 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 |
 # +-------------------+
@@ -292,7 +292,7 @@ Host appartement hackpartement appartement.crans.org hackpartement.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
 
@@ -316,6 +316,16 @@ Host backbone.adm backbone.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host bakdaur bakdaur.crans.org
+    HostName bakdaur.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host bakdaur.adm bakdaur.adm.crans.org
+    HostName bakdaur.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host backbone.wifi backbone.wifi.crans.org
     HostName backbone.wifi.crans.org
     User legallic
@@ -325,8 +335,8 @@ Host batk-0 batk-0.crans.org
     HostName batk-0.crans.org
     User legallic
 
-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
 
@@ -365,6 +375,16 @@ Host cochon.ferme cochon cochon television tv cochon.ferme.crans.org television.
     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
@@ -380,6 +400,11 @@ Host dhcp.adm dhcp.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host discourse discourse-srv discourse.crans.org discourse-srv.crans.org
+    HostName discourse-srv.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host dyson dyson.crans.org
     HostName dyson.crans.org
     User legallic
@@ -390,8 +415,8 @@ Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host ethercalc ethercalc.crans.org
-    HostName ethercalc.crans.org
+Host ethercalc ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org
+    HostName ethercalc-srv.crans.org
     User legallic
     ForwardAgent yes
 
@@ -405,13 +430,18 @@ Host freebox freebox.crans.org
     User legallic
     ForwardAgent yes
 
-Host ft ft.crans.org
-    HostName ft.crans.org
+Host frontdaur frontdaur.crans.org
+    HostName frontdaur.crans.org
     User legallic
     ForwardAgent yes
 
-Host ft-ilo ft-ilo.crans.org
-    HostName ft-ilo.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
 
@@ -420,7 +450,7 @@ Host ft.adm ft.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host fy munin fy.crans.org munin.crans.org
+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
@@ -445,12 +475,12 @@ Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
     User legallic
     ForwardAgent yes
 
-Host geet.adm git.adm geet.adm.crans.org git.adm.crans.org
+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 webmail horde.crans.org webmail.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
@@ -515,11 +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 malloc malloc.crans.org
     HostName malloc.crans.org
     User legallic
@@ -530,7 +555,7 @@ Host malloc.adm malloc.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host mediadrop video mediadrop.crans.org video.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
@@ -570,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 15ans 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
+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
@@ -600,6 +625,11 @@ Host odlyd.adm upload.adm odlyd.adm.crans.org upload.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host odlyd.wifi odlyd.wifi.crans.org
+    HostName odlyd.wifi.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host oie oie oie.ferme oie.crans.org oie.ferme.crans.org
     HostName oie.crans.org
     User legallic
@@ -610,6 +640,16 @@ Host oie.adm 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
@@ -620,6 +660,16 @@ Host owl.adm imap.adm pop.adm owl.adm.crans.org imap.adm.crans.org pop.adm.crans
     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
@@ -635,6 +685,11 @@ Host pegase 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
@@ -645,12 +700,12 @@ 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
@@ -685,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
@@ -695,7 +750,7 @@ Host sable.adm proxy.adm sable.adm.crans.org proxy.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
@@ -715,7 +770,7 @@ Host soyouz.adm soyoustart.adm soyouz.adm.crans.org soyoustart.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host ssh2 ssh2.crans.org
+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
@@ -723,6 +778,16 @@ 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
@@ -738,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
@@ -758,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
@@ -803,7 +878,7 @@ Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host zamok accounts ajaxterm bda-paris bde bleu blogs clubs 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 ajaxterm.crans.org clubs.crans.org bde.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
@@ -838,46 +913,28 @@ Host eap.adm eap eap eap.adm.crans.org
     ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
 
-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 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 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 odlyd-ilo.adm odlyd-ilo odlyd-ilo odlyd-ilo.adm.crans.org
-    HostName odlyd-ilo.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
-    HostKeyAlgorithms ssh-rsa
 
 Host radius.adm radius radius radius.adm.crans.org
     HostName radius.adm.crans.org
@@ -922,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 |
 # +-------------------+
@@ -975,24 +1051,27 @@ 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 ssh.dptinfo.ens-cachan.fr
+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
 
+
 # +--------+
 # | Stages |
 # +--------+
@@ -1002,34 +1081,5 @@ Host mars mars.lbpa 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.29.151
-    HostName 129.175.29.151
-    User vincent
-    ForwardAgent yes
-    ProxyCommand ssh pl-ssh.lri.fr -W %h:%p
-
 # END (utile pour éviter les merge conflicts)