[ssh_config] Mise à jour des serveurs SSH du Cr@ns

diff --git a/.ssh/config b/.ssh/config
index 2b39895e011ad4d36951a03e09ffc7e63b070fae..971932735a52102e354b10c43c538ffaa6aae214 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -62,7 +62,17 @@ 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
@@ -71,7 +81,7 @@ Host apprentis apprentis.crans.org
     HostName apprentis.crans.org
     User loginCr@ns
 
-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 loginCr@ns
     ForwardAgent yes
@@ -100,16 +110,6 @@ Host batk-0 batk-0.crans.org
     HostName batk-0.crans.org
     User loginCr@ns
 
-Host canard.adm canard.adm.crans.org
-    HostName canard.adm.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
-Host canard.ferme canard canard.ferme.crans.org
-    HostName canard.ferme.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host cas auth login cas.crans.org login.crans.org auth.crans.org
     HostName cas.crans.org
     User loginCr@ns
@@ -120,7 +120,7 @@ Host cas.adm cas.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host charybde darcs ftp ftp.crans.ens-cachan.fr karibe mirror ntp xn--hxamgu1bpkn charybde.crans.org karibe.crans.org xn--hxamgu1bpkn.crans.org ftp.crans.org mirror.crans.org ftp.crans.ens-cachan.fr ntp.crans.org
+Host charybde darcs ftp ftp.crans.ens-cachan.fr karibe mirror ntp xn--hxamgu1bpkn charybde.crans.org karibe.crans.org xn--hxamgu1bpkn.crans.org ftp.crans.org mirror.crans.org ftp.crans.ens-cachan.fr ntp.crans.org darcs.crans.org
     HostName charybde.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -130,17 +130,22 @@ Host charybde.adm ftp.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.adm.cran
     User loginCr@ns
     ForwardAgent yes
 
-Host civet.crans.org civet
+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.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 loginCr@ns
     ForwardAgent yes
@@ -160,17 +165,7 @@ Host dhcp.adm dhcp.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host dindon.adm dindon.adm.crans.org
-    HostName dindon.adm.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
-Host dindon.ferme dindon dindon.ferme.crans.org
-    HostName dindon.ferme.crans.org
-    User loginCr@ns
-    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 loginCr@ns
     ForwardAgent yes
@@ -185,37 +180,62 @@ Host ethercalc ethercalc.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 geet.crans.org git.crans.org geet git
-    HostName geet.crans.org
+Host ft ft.crans.org
+    HostName ft.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host geet.adm.crans.org git.adm.crans.org geet.adm git.adm
-    HostName geet.adm.crans.org
+Host ft-ilo ft-ilo.crans.org
+    HostName ft-ilo.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host gordon gordon.crans.org
-    HostName gordon.crans.org
+Host ft.adm ft.adm.crans.org
+    HostName ft.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host gordon.adm gordon.adm.crans.org
-    HostName gordon.adm.crans.org
+Host fy munin fy.crans.org munin.crans.org
+    HostName fy.crans.org
     User loginCr@ns
     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 fy.adm fy.adm.crans.org
+    HostName fy.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host horde horde.crans.org
+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 geet.adm.crans.org git.adm.crans.org
+    HostName geet.adm.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+Host horde webmail horde.crans.org webmail.crans.org
     HostName horde.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -225,7 +245,7 @@ Host horde.adm horde.adm.crans.org
     User loginCr@ns
     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 loginCr@ns
     ForwardAgent yes
@@ -245,16 +265,6 @@ Host isc.adm isc.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host jouvence poulet poulet.ferme jouvence.crans.org poulet.ferme.crans.org
-    HostName jouvence.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
-Host jouvence.adm poulet.adm jouvence.adm.crans.org poulet.adm.crans.org
-    HostName jouvence.adm.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host kdell kdell.crans.org
     HostName kdell.crans.org
     User loginCr@ns
@@ -265,7 +275,7 @@ Host kdell.adm kdell.adm.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
+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
@@ -295,16 +305,6 @@ Host komaz.wifi komaz.wifi.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host lapin.adm lapin.adm.crans.org
-    HostName lapin.adm.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
-Host lapin.ferme lapin lapin.ferme.crans.org
-    HostName lapin.ferme.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host malloc malloc.crans.org
     HostName malloc.crans.org
     User loginCr@ns
@@ -315,13 +315,13 @@ Host malloc.adm malloc.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host mdr television vache vache.ferme mdr.crans.org television.crans.org vache.ferme.crans.org
-    HostName mdr.crans.org
+Host mediadrop video mediadrop.crans.org video.crans.org
+    HostName mediadrop.crans.org
     User loginCr@ns
     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 loginCr@ns
     ForwardAgent yes
 
@@ -355,7 +355,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org
     User loginCr@ns
     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 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
     HostName niomniom.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -375,36 +375,46 @@ Host o2.adm o2.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host oie.adm oie.adm.crans.org
-    HostName oie.adm.crans.org
+Host odlyd odlyd.crans.org
+    HostName odlyd.crans.org
     User loginCr@ns
     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 loginCr@ns
     ForwardAgent yes
 
-Host ovh msn ovh.crans.org msn.crans.org
-    HostName ovh.crans.org
+Host oie oie oie.ferme oie.crans.org oie.ferme.crans.org
+    HostName oie.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host ovh.adm ovh.adm.crans.org
-    HostName ovh.adm.crans.org
+Host oie.adm oie.adm.crans.org
+    HostName oie.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host owl imap pop webmail owl.crans.org pop.crans.org imap.crans.org webmail.crans.org
+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 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 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
@@ -430,6 +440,11 @@ Host redisdead.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.or
     User loginCr@ns
     ForwardAgent yes
 
+Host rezosup rezosup.crans.org
+    HostName rezosup.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host roundcube roundcube.crans.org
     HostName roundcube.crans.org
     User loginCr@ns
@@ -465,16 +480,6 @@ Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org
     User loginCr@ns
     ForwardAgent yes
 
-Host schrodingred schrodingred.crans.org
-    HostName schrodingred.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
-Host schrodingred.adm schrodingred.adm.crans.org
-    HostName schrodingred.adm.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host sogo sogo.crans.org
     HostName sogo.crans.org
     User loginCr@ns
@@ -486,8 +491,13 @@ Host sogo.adm sogo.adm.crans.org
     ForwardAgent yes
 
 Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
-    HostName soyoustart.crans.org
-    HostName loginCr@ns
+    HostName soyouz.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
+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 ssh2.crans.org
@@ -498,6 +508,11 @@ Host ssh2 ssh2.crans.org
     User loginCr@ns
     ForwardAgent yes
 
+Host stun-secondary stun-secondary.crans.org
+    HostName stun-secondary.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host template template.crans.org
     HostName template.crans.org
     User loginCr@ns
@@ -543,6 +558,11 @@ Host vo calendrier intranet-dev news-dev openid-dev weavesync vo.crans.org weave
     User loginCr@ns
     ForwardAgent yes
 
+Host vo-eth0 vo-eth0.crans.org
+    HostName vo-eth0.crans.org
+    User loginCr@ns
+    ForwardAgent yes
+
 Host vo.adm vo.adm.crans.org
     HostName vo.adm.crans.org
     User loginCr@ns
@@ -568,7 +588,7 @@ Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
     User loginCr@ns
     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 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
     HostName zamok.crans.org
     User loginCr@ns
     ForwardAgent yes
@@ -584,13 +604,6 @@ Host zamok.adm bleu.adm impression.adm users.adm zamok.adm.crans.org bleu.adm.cr
 # +-------------------------+
 # 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 loginCr@ns
-    ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
 
 Host babar.adm babar babar babar.adm.crans.org
     HostName babar.adm.crans.org
@@ -604,30 +617,12 @@ 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 loginCr@ns
-    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
     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
-    ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
-    HostKeyAlgorithms ssh-rsa
-
-Host ft.adm ft ft ft.adm.crans.org
-    HostName ft.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host fx-ilo.adm fx-ilo zamok-ilo.adm fx-ilo fx-ilo.adm.crans.org zamok-ilo.adm.crans.org
     HostName fx-ilo.adm.crans.org
     User loginCr@ns
@@ -642,11 +637,6 @@ Host fy-ilo.adm fy-ilo fy-ilo fy-ilo.adm.crans.org
     ProxyCommand ssh sable.crans.org -W %h:%p
     HostKeyAlgorithms ssh-rsa
 
-Host fy.adm fy fy fy.adm.crans.org
-    HostName fy.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host fz-ilo.adm fz-ilo fz-ilo fz-ilo.adm.crans.org
     HostName fz-ilo.adm.crans.org
     User loginCr@ns
@@ -654,11 +644,6 @@ Host fz-ilo.adm fz-ilo fz-ilo fz-ilo.adm.crans.org
     ProxyCommand ssh sable.crans.org -W %h:%p
     HostKeyAlgorithms ssh-rsa
 
-Host fz.adm fz fz fz.adm.crans.org
-    HostName fz.crans.org
-    User loginCr@ns
-    ForwardAgent yes
-
 Host kdell-idrac.adm kdell-idrac kdell-idrac kdell-idrac.adm.crans.org
     HostName kdell-idrac.adm.crans.org
     User loginCr@ns
@@ -672,11 +657,12 @@ Host komaz-ilo.adm komaz-ilo komaz-ilo komaz-ilo.adm.crans.org
     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
+Host odlyd-ilo.adm odlyd-ilo odlyd-ilo odlyd-ilo.adm.crans.org
+    HostName odlyd-ilo.adm.crans.org
     User loginCr@ns
     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
@@ -697,12 +683,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 loginCr@ns
-    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