Disambiguation serveurs ENST / serveurs Crans

diff --git a/.ssh/config b/.ssh/config
index 28938119f747f4573a9669a814837693de42f58a..f5ef6f17dae91fb87c181ac2a550db32b6c3b8dc 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -293,7 +293,7 @@ Host med zavoyarde med.crans.org zavoyarde.crans.org
 # Accessible aux apprentis
 # sauf zamok et ssh2, accessibles à tous les adhérents
 
-Host alice alice.crans.org
+Host alice.crans.org
     HostName alice.crans.org
     User legallic
     ForwardAgent yes
@@ -303,12 +303,12 @@ Host alice.adm alice.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host appartement hackpartement appartement.crans.org hackpartement.crans.org
+Host appartement.crans.org hackpartement.crans.org
     HostName appartement.crans.org
     User legallic
     ForwardAgent yes
 
-Host apprentis munin-apprentis apprentis.crans.org munin-apprentis.crans.org
+Host apprentis apprentis.crans.org munin-apprentis.crans.org
     HostName apprentis.crans.org
     User legallic
 
@@ -322,7 +322,7 @@ Host asterisk.adm asterisk.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host backbone backbone.crans.org
+Host backbone.crans.org
     HostName backbone.crans.org
     User legallic
     ForwardAgent yes
@@ -351,7 +351,7 @@ Host batk-0 batk-0.crans.org
     HostName batk-0.crans.org
     User legallic
 
-Host cas-srv cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
+Host cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
     HostName cas-srv.crans.org
     User legallic
     ForwardAgent yes
@@ -361,7 +361,7 @@ Host cas.adm cas.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host charybde darcs ftp.crans.ens-cachan.fr 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
+Host charybde 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 legallic
     ForwardAgent yes
@@ -371,7 +371,7 @@ Host charybde.adm ftp.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.adm.cran
     User legallic
     ForwardAgent yes
 
-Host civet rabbitmq vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
+Host civet vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
     HostName civet.crans.org
     User legallic
     ForwardAgent yes
@@ -406,7 +406,7 @@ Host dhcp.crans.org
     User legallic
     ForwardAgent yes
 
-Host dhcp-21 dhcp-21.crans.org
+Host dhcp-21.crans.org
     HostName dhcp-21.crans.org
     User legallic
     ForwardAgent yes
@@ -431,7 +431,7 @@ 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
+Host ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org
     HostName ethercalc-srv.crans.org
     User legallic
     ForwardAgent yes
@@ -486,7 +486,7 @@ Host fz.adm fz.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host geet geet.crans.org git.crans.org gitlab.crans.org
+Host geet.crans.org git.crans.org gitlab.crans.org
     HostName geet.crans.org
     User legallic
     ForwardAgent yes
@@ -496,7 +496,7 @@ Host geet.adm git.adm gitlab.adm geet.adm.crans.org git.adm.crans.org gitlab.adm
     User legallic
     ForwardAgent yes
 
-Host horde horde-srv webmail horde.crans.org horde-srv.crans.org webmail.crans.org
+Host horde horde-srv horde.crans.org horde-srv.crans.org webmail.crans.org
     HostName horde.crans.org
     User legallic
     ForwardAgent yes
@@ -506,7 +506,7 @@ Host horde.adm horde.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
+Host irc.crans.org qwebirc.crans.org web-irc.crans.org
     HostName irc.crans.org
     User legallic
     ForwardAgent yes
@@ -536,7 +536,7 @@ Host kdell.adm kdell.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host kenobi infinoted kenobby laval obby pad pastebin zero kenobi.crans.org obby.crans.org kenobby.crans.org infinoted.crans.org laval.crans.org pad.crans.org zero.crans.org pastebin.crans.org
+Host 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
@@ -561,17 +561,7 @@ Host komaz.adm komaz.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host malloc malloc.crans.org
-    HostName malloc.crans.org
-    User legallic
-    ForwardAgent yes
-
-Host malloc.adm malloc.adm.crans.org
-    HostName malloc.adm.crans.org
-    User legallic
-    ForwardAgent yes
-
-Host mediadrop mediadrop-srv video mediadrop.crans.org video.crans.org mediadrop-srv.crans.org video-srv.crans.org
+Host mediadrop mediadrop-srv mediadrop.crans.org video.crans.org mediadrop-srv.crans.org video-srv.crans.org
     HostName mediadrop.crans.org
     User legallic
     ForwardAgent yes
@@ -581,7 +571,7 @@ Host mediadrop.adm mediadrop.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host nat64 nat64.crans.org
+Host nat64.crans.org
     HostName nat64.crans.org
     User legallic
     ForwardAgent yes
@@ -591,7 +581,7 @@ Host nat64.adm nat64.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host nem nem.crans.org
+Host nem.crans.org
     HostName nem.crans.org
     User legallic
     ForwardAgent yes
@@ -601,7 +591,7 @@ Host nem.adm nem.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host news web-news webnews news.crans.org web-news.crans.org webnews.crans.org
+Host news.crans.org web-news.crans.org webnews.crans.org
     HostName news.crans.org
     User legallic
     ForwardAgent yes
@@ -611,7 +601,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host niomniom 15ans crans.ens-cachan.fr crans.org install-party webalizer 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
+Host niomniom 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
@@ -621,7 +611,7 @@ Host niomniom.adm niomniom.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org
+Host o2 o2.crans.org switchs.crans.org intranet2.crans.org
     HostName o2.crans.org
     User legallic
     ForwardAgent yes
@@ -646,16 +636,6 @@ Host odlyd.wifi 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
-    ForwardAgent yes
-
-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
@@ -696,11 +676,6 @@ Host pea.adm pea.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host pegase pegase.crans.org
-    HostName pegase.crans.org
-    User legallic
-    ForwardAgent yes
-
 Host proxy.crans.org
     HostName proxy.crans.org
     User legallic
@@ -741,7 +716,7 @@ Host roundcube.adm roundcube.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host deconnexion routeur.crans.org deconnexion.crans.org
+Host routeur.crans.org deconnexion.crans.org
     HostName routeur.crans.org
     User legallic
     ForwardAgent yes
@@ -756,7 +731,7 @@ Host routeur.adm routeur.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host sable dns sable.crans.org dns.crans.org
+Host sable sable.crans.org dns.crans.org
     HostName sable.crans.org
     User legallic
     ForwardAgent yes
@@ -794,12 +769,12 @@ Host stitch.adm stitch.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host stun-secondary stun-secondary.crans.org
+Host stun-secondary.crans.org
     HostName stun-secondary.crans.org
     User legallic
     ForwardAgent yes
 
-Host template template.crans.org
+Host template.crans.org
     HostName template.crans.org
     User legallic
     ForwardAgent yes
@@ -809,17 +784,7 @@ Host template.adm template.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host test1.crans.org
-    HostName test1.crans.org
-    User legallic
-    ForwardAgent yes
-
-Host test2.crans.org
-    HostName test2.crans.org
-    User legallic
-    ForwardAgent yes
-
-Host thot psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
+Host thot thot.crans.org psuornotpsu.crans.org logs.crans.org
     HostName thot.crans.org
     User legallic
     ForwardAgent yes
@@ -839,7 +804,7 @@ Host titanic.adm titanic.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
+Host tracker.crans.org todo.crans.org phabricattor.crans.org
     HostName tracker.crans.org
     User legallic
     ForwardAgent yes
@@ -849,7 +814,7 @@ Host tracker.adm tracker.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host vo calendrier intranet-dev news-dev openid-dev weavesync vo.crans.org weavesync.crans.org intranet-dev.crans.org calendrier.crans.org openid-dev.crans.org news-dev.crans.org
+Host vo 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 legallic
     ForwardAgent yes
@@ -864,7 +829,7 @@ Host vo.adm vo.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host xmpp aim chat.yahoo conference conference.jabber icq jabber yahoo xmpp.crans.org icq.crans.org aim.crans.org conference.crans.org jabber.crans.org yahoo.crans.org chat.yahoo.crans.org conference.jabber.crans.org
+Host 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 legallic
     ForwardAgent yes
@@ -884,7 +849,7 @@ Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host zamok clubs.ens-cachan.fr 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
+Host zamok bde bleu clubs.ens-cachan.fr pot-vieux 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