Répercussion de l'amélioration de la génération automatique + Ajout des machines...

diff --git a/config/.ssh/config b/config/.ssh/config
index 0ab8b36b16e2b929085a0d7c8690b0b8ac0a6df9..f3fd7d852e8ad923af2379a5060abf04a81dc558 100644 (file)
--- a/config/.ssh/config
+++ b/config/.ssh/config
@@ -2,6 +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
 # Licence : WTFPL
 
 # Les sections commentées par #~# sont des features qui ne sont pas activées
@@ -9,7 +10,7 @@
 
 # À 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 "logincrans" et "loginENS" par les login idoines
+# Pensez à remplacer "loginCr@ns", "loginFedeRez" et "loginENS" par les login idoines
 
 #------------------------------------------------------------------------------
 
@@ -54,209 +55,256 @@ Host kfet kfet.crans.org kfet1
 # Accessible aux apprentis
 # sauf zamok et ssh2, accessibles à tous les adhérents
 
-Host zamok.crans.org zamok fx fx.adm.crans.org
-    HostName zamok.crans.org
-    User logincrans
+Host appartement appartement.crans.org
+    HostName appartement.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host ssh2.crans.org ssh2
-    # Un serveur ssh qui n'est qu'un nat vers 138.231.136.1:22
-    # pour passer à travers les blocages de ports
-    # le port 443 (https) est rarement bloqué
-    HostName 138.231.136.2
-    Port 443
-    User logincrans
-    ForwardAgent yes
+Host apprentis apprentis.crans.org
+    HostName apprentis.crans.org
+    User loginCr@ns
 
-Host asterisk.crans.org asterisk
+Host asterisk sip asterisk.adm.crans.org asterisk.crans.org sip.crans.org
     HostName asterisk.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host canard.ferme.crans.org canard canard.ferme
+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
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host cas cas.crans.org
+Host cas auth login cas.adm.crans.org cas.crans.org login.crans.org auth.crans.org
     HostName cas.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host charybde.crans.org charybde karibe xn--hxamgu1bpkn git
+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
     HostName charybde.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+
+Host cochon cochon.ferme.crans.org cochon.adm.crans.org
+    HostName cochon.ferme.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host dhcp dhcp.crans.org
+Host dhcp dhcp.adm.crans.org dhcp.crans.org
     HostName dhcp.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host dindon.ferme.crans.org dindon.ferme dindon
-    HostName dindon.ferme.crans.org
-    User logincrans
+Host dhcp-21 dhcp-21.crans.org
+    HostName dhcp-21.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host dyson.crans.org dyson nagios nagios.crans.org munin munin.crans.org
-    HostName dyson.crans.org
-    User logincrans
+Host dindon dindon.ferme.crans.org dindon.adm.crans.org
+    HostName dindon.ferme.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host eap peap eap.wifi.crans.org
-    HostName eap.wifi.crans.org
-    User logincrans
+Host dyson munin nagios dyson.crans.org munin.crans.org nagios.crans.org dyson.adm.crans.org munin.adm.crans.org
+    HostName dyson.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host freebox.crans.org freebox
+Host freebox freebox.crans.org
     HostName freebox.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host gordon.crans.org gordon
+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
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host irc.crans.org irc
+Host irc qwebirc web-irc irc.crans.org web-irc.crans.org qwebirc.crans.org irc.adm.crans.org
     HostName irc.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+
+Host isc isc.crans.org isc.adm.crans.org
+    HostName isc.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host jouvence.crans.org jouvence
-    HostName jouvence.crans.org
-    User logincrans
+Host jouvence poulet jouvence.crans.org poulet.ferme.crans.org jouvence.adm.crans.org poulet.adm.crans.org
+    HostName poulet.ferme.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host kdell kdell.crans.org
+Host kdell kdell.adm.crans.org kdell.crans.org
     HostName kdell.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host kenobi.crans.org kenobi obby laval
+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
     HostName kenobi.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host komaz.crans.org komaz
+Host komaz komaz.crans.org komaz.adm.crans.org komaz.wifi.crans.org
     HostName komaz.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+
+Host komaz-21 komaz-21.crans.org
+    HostName komaz-21.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host lapin.ferme.crans.org lapin lapin.ferme
+Host lapin lapin.ferme.crans.org lapin.adm.crans.org
     HostName lapin.ferme.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host malloc.crans.org malloc
+Host malloc malloc.crans.org malloc.adm.crans.org
     HostName malloc.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host mdr.crans.org mdr vache vache.ferme
-    HostName mdr.crans.org
-    User logincrans
+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
+    User loginCr@ns
     ForwardAgent yes
 
-Host morgan.crans.org morgan
-    HostName morgan.crans.org
-    User logincrans
+Host nat64 nat64.adm.crans.org nat64.crans.org
+    HostName nat64.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host nat64 nat64.crans.org
-    HostName nat64.crans.org
-    User logincrans
+Host nem nem.crans.org nem.adm.crans.org
+    HostName nem.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host news.crans.org news
+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
     HostName news.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host niomniom.crans.org niomniom wiki doc
+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
     HostName niomniom.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host o2.crans.org o2
+Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org o2.adm.crans.org
     HostName o2.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host oie.ferme.crans.org oie oie.ferme
+Host oie oie.ferme.crans.org oie.adm.crans.org
     HostName oie.ferme.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host ovh.crans.org ovh
+Host ovh msn ovh.crans.org msn.crans.org ovh.adm.crans.org
     HostName ovh.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host owl.crans.org owl imap imap.crans.org pop pop.crans.org
+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
     HostName owl.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host poulet poulet.ferme poulet.ferme.crans.org
-    HostName poulet.ferme.crans.org
-    User logincrans
+Host pegase pegase.crans.org
+    HostName pegase.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host redisdead.crans.org redisdead smtp smtp.crans.org
+Host puppet puppet.adm.crans.org 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
     HostName redisdead.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host routeur routeur.crans.org
+Host routeur deconnexion routeur.adm.crans.org routeur.crans.org deconnexion.crans.org
     HostName routeur.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host sable.crans.org sable
+Host routeur-21 routeur-21.crans.org
+    HostName 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
     HostName sable.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+
+Host schrodingred schrodingred.crans.org schrodingred.adm.crans.org
+    HostName schrodingred.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host sogo.crans.org sogo
+Host sogo sogo.crans.org sogo.adm.crans.org
     HostName sogo.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+
+Host ssh2 ssh2.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
+    Port 443
+    User loginCr@ns
+    ForwardAgent yes
+
+Host template template.crans.org template.adm.crans.org
+    HostName template.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host thot thot.crans.org
+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
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host titanic.crans.org titanic
+Host titanic titanic.crans.org titanic.adm.crans.org
     HostName titanic.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+
+Host titanic-21 titanic-21.crans.org
+    HostName titanic-21.crans.org
+    User loginCr@ns
     ForwardAgent yes
 
-Host tracker.crans.org tracker
+Host tracker todo tracker.crans.org todo.crans.org tracker.adm.crans.org
     HostName tracker.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host vo.crans.org vo
+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
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host xmpp.crans.org xmpp
+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
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-Host ytrap-llatsni.crans.org ytrap-llatsni install-party
+Host ytrap-llatsni ytrap-llatsni.crans.org ytrap-llatsni.adm.crans.org
     HostName ytrap-llatsni.crans.org
-    User logincrans
+    User loginCr@ns
     ForwardAgent yes
 
-# Serveur des apprentis
-Host apprentis apprentis.crans.org
-    HostName apprentis.crans.org
-    User logincrans
+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
+    User loginCr@ns
+    ForwardAgent yes
 
 
 # +-------------------------+
@@ -266,68 +314,133 @@ Host apprentis apprentis.crans.org
 # d'où la ProxyCommand
 # fy et fz ne sont accessibles qu'aux nounous
 
-Host babar.adm.crans.org babar babar.adm
-    HostName babar.adm.crans.org
-    User logincrans
+Host 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 babar.adm.crans.org
+    HostName babar.adm.crans.org
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host bcfg2.adm.crans.org bcfg2 bcfg2.adm
+Host bcfg2 bcfg2.adm.crans.org
     HostName bcfg2.adm.crans.org
-    User logincrans
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
 
 Host daath daath.adm.crans.org
     HostName daath.adm.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
     ProxyCommand ssh sable.crans.org -W %h:%p
+
+Host eap eap.adm.crans.org
+    HostName eap.adm.crans.org
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host fy.adm.crans.org fy fy.adm
+Host fx-ilo zamok-ilo fx-ilo.adm.crans.org zamok-ilo.adm.crans.org
+    HostName fx-ilo.adm.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
-    User logincrans
+    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
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
+    HostKeyAlgorithms ssh-rsa
 
-Host fz.adm.crans.org fz fz.adm
+Host fz fz.adm.crans.org
     HostName fz.adm.crans.org
-    User logincrans
+    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
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
+    HostKeyAlgorithms ssh-rsa
 
-Host radius.adm.crans.org radius radius.adm
+Host kdell-idrac kdell-idrac.adm.crans.org
+    HostName kdell-idrac.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
+    User loginCr@ns
+    ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
+    HostKeyAlgorithms ssh-rsa
+
+Host radius radius.adm.crans.org
     HostName radius.adm.crans.org
-    User logincrans
+    User loginCr@ns
+    ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
+
+Host 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
+    HostName slon.adm.crans.org
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host vert.adm.crans.org vert vert.adm zelda.adm.crans.org zelda zelda.adm
+Host vert ldap zelda vert.adm.crans.org ldap.adm.crans.org zelda.adm.crans.org
     HostName vert.adm.crans.org
-    User logincrans
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    User loginCr@ns
     ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
 
-Host zbee zbee.adm.crans.org
+Host zbee fx nfs zbee.adm.crans.org nfs.adm.crans.org fx.adm.crans.org
     HostName zbee.adm.crans.org
-    User logincrans
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    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
+    User loginCr@ns
+    ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
 
-# +---------------------+
-# | Serveurs de FedeRez |
-# +---------------------+
-# Accessibles à l'équipe d'administration de FedeRez
 
-Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
-    HostName baldrick.federez.net
-    User logincrans
-    ForwardAgent yes
+# +---------+
+# | FedeRez |
+# +---------+
+# Accessibles aux membres de l'équipe d'admin de FedeRez
 
 Host nautilus nautilus.federez.net
     HostName nautilus.federez.net
-    User logincrans
+    User loginFedeRez
+    ForwardAgent yes
+
+Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
+    HostName baldrick.federez.net
+    User loginFedeRez
     ForwardAgent yes
 
 
@@ -344,3 +457,31 @@ Host tahines.ens-cachan.fr tahines2 tahines
     HostName tahines.ens-cachan.fr
     User loginENS
 
+
+# +------------------+
+# | Département info |
+# +------------------+
+# Machines du département informatique de l'ENSC
+# Accesibles aux A0
+
+Host dptinfo21.dptinfo.ens-cachan.fr info21 infossh ssh.dptinfo
+    #HostName 138.231.36.60
+    HostName ssh.dptinfo.ens-cachan.fr
+    User loginENS
+    ForwardAgent yes
+
+Host dptinfo*.dptinfo.ens-cachan.fr
+    HostName %h
+    User loginENS
+    ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
+    ForwardAgent yes
+
+Host info*
+    HostName dpt%h.dptinfo.ens-cachan.fr
+    User loginENS
+    ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
+    ForwardAgent yes
+
+
+# END (utile pour éviter les merge conflicts)
+