diff --git a/.ssh/config.old b/.ssh/config.old
index e99f02f64fcde585125f0ba8ebd2984826102e1c..029100e30d8c37cb040d484556f3d0b2bb03310d 100644
--- a/.ssh/config.old
+++ b/.ssh/config.old
@@ -116,32 +116,17 @@ Host alice.adm 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 munin-apprentis apprentis.crans.org munin-apprentis.crans.org
+Host apprentis apprentis.crans.org
HostName apprentis.crans.org
User loginCr@ns
-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
+Host backbone.wifi backbone.wifi.crans.org
+ HostName backbone.wifi.crans.org
User loginCr@ns
ForwardAgent yes
@@ -155,15 +140,6 @@ Host bakdaur.adm 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 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
@@ -174,7 +150,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 darcs.crans.org
+Host charybde 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
HostName charybde.crans.org
User loginCr@ns
ForwardAgent yes
@@ -194,53 +170,23 @@ Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.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 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
-Host dhcp-21 dhcp-21.crans.org
- HostName dhcp-21.crans.org
- User loginCr@ns
- ForwardAgent yes
-
Host dhcp.adm dhcp.adm.crans.org
HostName dhcp.adm.crans.org
User loginCr@ns
ForwardAgent yes
-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
+Host digicode-4j digicode-4j.crans.org
+ HostName digicode-4j.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
+Host digicode-4j.adm digicode-4j.adm.crans.org
+ HostName digicode-4j.adm.crans.org
User loginCr@ns
ForwardAgent yes
@@ -299,78 +245,73 @@ Host fz.adm 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
+Host gulp gulp.crans.org
+ HostName gulp.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
+Host gulp.adm gulp.adm.crans.org
+ HostName gulp.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host irc.adm irc.adm.crans.org
- HostName irc.adm.crans.org
+Host jitsi jitsi.crans.org
+ HostName jitsi.crans.org
User loginCr@ns
ForwardAgent yes
-Host isc isc.crans.org
- HostName isc.crans.org
+Host jitsi.adm jitsi.adm.crans.org
+ HostName jitsi.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host isc.adm isc.adm.crans.org
- HostName isc.adm.crans.org
+Host gitzly git gitlab gitzly.crans.org git.crans.org
+ HostName gitzly.crans.org
User loginCr@ns
ForwardAgent yes
-Host kdell kdell.crans.org
- HostName kdell.crans.org
+Host gitzly.adm git.adm gitlab.adm gitzly.adm.crans.org git.adm.crans.org gitlab.adm.crans.org
+ HostName gitzly.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host kdell.adm kdell.adm.crans.org
- HostName kdell.adm.crans.org
+Host ipv6 ipv6-zayo ipv6.crans.org ipv6-zayo.crans.org
+ HostName ipv6-zayo.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
+Host ipv6.adm ipv6-zayo.adm ipv6.adm.crans.org ipv6-zayo.adm.crans.org
+ HostName ipv6-zayo.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host kenobi.adm kenobi.adm.crans.org
- HostName kenobi.adm.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
-Host komaz komaz.crans.org
- HostName komaz.crans.org
+Host irc.adm irc.adm.crans.org
+ HostName irc.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host komaz-21 komaz-21.crans.org
- HostName komaz-21.crans.org
+Host kenobi pad pastebin zero kenobi.crans.org pad.crans.org zero.crans.org pastebin.crans.org
+ HostName kenobi.crans.org
User loginCr@ns
ForwardAgent yes
-Host komaz.adm komaz.adm.crans.org
- HostName komaz.adm.crans.org
+Host kenobi.adm kenobi.adm.crans.org
+ HostName kenobi.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host malloc malloc.crans.org
- HostName malloc.crans.org
+Host kiwi kiwi.crans.org wiki wikipedia wiki.crans.org wikipedia.crans.org
+ HostName kiwi.crans.org
User loginCr@ns
ForwardAgent yes
-Host malloc.adm malloc.adm.crans.org
- HostName malloc.adm.crans.org
+Host kiwi.adm wiki.adm kiwi.adm.crans.org wiki.adm.crans.org
+ HostName kiwi.adm.crans.org
User loginCr@ns
ForwardAgent yes
@@ -384,16 +325,6 @@ Host mediadrop.adm mediadrop.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host nat64 nat64.crans.org
- HostName nat64.crans.org
- User loginCr@ns
- ForwardAgent yes
-
-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
@@ -414,7 +345,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.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 www www.15ans niomniom.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 15ans.crans.org www.15ans.crans.org autoconfig.crans.org
+Host niomniom autoconfig autostatus doc niomniom.crans.org autostatus.crans.org doc.crans.org autoconfig.crans.org
HostName niomniom.crans.org
User loginCr@ns
ForwardAgent yes
@@ -424,16 +355,6 @@ Host niomniom.adm 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 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
@@ -449,26 +370,6 @@ Host odlyd.wifi 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
@@ -489,36 +390,11 @@ Host owncloud.adm 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 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 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
@@ -529,18 +405,18 @@ Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.ad
User loginCr@ns
ForwardAgent yes
-Host rezosup rezosup.crans.org
- HostName rezosup.crans.org
+Host roundcube roundcube-srv roundcube.crans.org roundcube-srv.crans.org
+ HostName roundcube-srv.crans.org
User loginCr@ns
ForwardAgent yes
-Host routeur deconnexion routeur.crans.org deconnexion.crans.org
- HostName routeur.crans.org
+Host roundcube.adm roundcube.adm.crans.org
+ HostName roundcube.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host routeur-21 routeur-21.crans.org
- HostName routeur-21.crans.org
+Host routeur deconnexion routeur.crans.org deconnexion.crans.org
+ HostName routeur.crans.org
User loginCr@ns
ForwardAgent yes
@@ -549,23 +425,13 @@ Host routeur.adm routeur.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host sable dns sable.crans.org dns.crans.org
- HostName sable.crans.org
+Host silice silice.crans.org
+ HostName silice.crans.org
User loginCr@ns
ForwardAgent yes
-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
+Host silice.adm silice.adm.crans.org
+ HostName silice.adm.crans.org
User loginCr@ns
ForwardAgent yes
@@ -597,31 +463,6 @@ Host stitch.adm stitch.adm.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
- ForwardAgent yes
-
-Host template.adm template.adm.crans.org
- HostName template.adm.crans.org
- User loginCr@ns
- ForwardAgent yes
-
-Host test1 test1.crans.org
- HostName test1.crans.org
- User loginCr@ns
- ForwardAgent yes
-
-Host test2 test2.crans.org
- HostName test2.crans.org
- User loginCr@ns
- ForwardAgent yes
-
Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
HostName thot.crans.org
User loginCr@ns
@@ -642,13 +483,13 @@ Host titanic.adm titanic.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
- HostName tracker.crans.org
+Host unifi unifi.crans.org
+ HostName unifi.crans.org
User loginCr@ns
ForwardAgent yes
-Host tracker.adm tracker.adm.crans.org
- HostName tracker.adm.crans.org
+Host unifi.adm unifi.adm.crans.org
+ HostName unifi.adm.crans.org
User loginCr@ns
ForwardAgent yes
@@ -657,56 +498,41 @@ 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
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
- HostName xmpp.crans.org
+Host vulcain vulcain.crans.org
+ HostName vulcain.crans.org
User loginCr@ns
ForwardAgent yes
-Host xmpp.adm jabber.adm xmpp.adm.crans.org jabber.adm.crans.org
- HostName xmpp.adm.crans.org
+Host vulcain.adm vulcain.adm.crans.org
+ HostName vulcain.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host ytrap-llatsni ytrap-llatsni.crans.org
- HostName ytrap-llatsni.crans.org
+Host xmpp aim conference conference.jabber icq jabber 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
-Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
- HostName ytrap-llatsni.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
-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
+Host zamok ajaxterm bda-paris blogs clubs clubs.ens-cachan.fr mysql perso pot-vieux ssh zamok.crans.org ssh.crans.org perso.crans.org clubs.ens-cachan.fr www.clubs.ens-cachan.fr mysql.crans.org blogs.crans.org bda-paris.crans.org ajaxterm.crans.org clubs.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
+Host zamok.adm users.adm zamok.adm.crans.org users.adm.crans.org
HostName zamok.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host kiwi kiwi.crans.org wiki wikipedia wiki.crans.org wikipedia.crans.org
- HostName kiwi.crans.org
- User loginCr@ns
- ForwardAgent yes
-
-Host kiwi.adm kiwi.adm.crans.org
- HostName kiwi.adm.crans.org
- User loginCr@ns
- ForwardAgent yes
-
# +-------------------------+
# | Serveurs Cr@ns adm-only |
@@ -714,14 +540,14 @@ Host kiwi.adm kiwi.adm.crans.org
# 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
+Host cochon.adm cochon.adm.crans.org
+ HostName cochon.adm.crans.org
User loginCr@ns
ForwardAgent yes
ProxyCommand ssh odlyd.crans.org -W %h:%p
-Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
- HostName bcfg2.adm.crans.org
+Host cups.adm cups.adm.crans.org
+ HostName cups.adm.crans.org
User loginCr@ns
ForwardAgent yes
ProxyCommand ssh odlyd.crans.org -W %h:%p
@@ -738,11 +564,6 @@ Host horde horde.adm webmail horde.crans.org horde.adm.crans.org webmail.crans.o
ForwardAgent yes
ProxyCommand ssh odlyd.crans.org -W %h:%p
-Host kdell-idrac.adm kdell-idrac kdell-idrac kdell-idrac.adm.crans.org
- HostName kdell-idrac.adm.crans.org
- User root
- ProxyCommand ssh odlyd.crans.org -W %h:%p
-
Host *-ilo
HostName %h.adm.crans.org
User Administrator
@@ -751,7 +572,6 @@ Host *-ilo
GSSAPIAuthentication no
HostbasedAuthentication no
PubkeyAuthentication no
- RSAAuthentication no
Compression no
ForwardAgent no
ForwardX11 no
@@ -761,20 +581,32 @@ Host *-ilo
HostKeyAlgorithms ssh-rsa,ssh-dss
ProxyCommand ssh odlyd.crans.org -W %h:%p
+Host omnomnom.adm omnomnom.adm.crans.org
+ HostName omnomnom.adm.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+ ProxyCommand ssh odlyd.crans.org -W %h:%p
+
+Host phabricator todo tracker.adm tracker.adm.crans.org
+ HostName tracker.adm.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+ ProxyCommand ssh odlyd.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 odlyd.crans.org -W %h:%p
-Host roundcube roundcube.adm roundcube.crans.org roundcube.adm.crans.org
- HostName roundcube.adm.crans.org
+Host re2o re2o.adm re2o.adm.crans.org intranet intranet.adm intranet.adm.crans.org
+ HostName re2o.adm.crans.org
User loginCr@ns
ForwardAgent yes
ProxyCommand ssh odlyd.crans.org -W %h:%p
-Host sable-ilo.adm sable-ilo sable-ilo sable-ilo.adm.crans.org
- HostName sable-ilo.adm.crans.org
+Host re2o-bcfg2 re2o-bcfg2.adm re2o-bcfg2.adm.crans.org bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
+ HostName re2o-bcfg2.adm.crans.org
User loginCr@ns
ForwardAgent yes
ProxyCommand ssh odlyd.crans.org -W %h:%p
@@ -792,6 +624,12 @@ Host vert.adm ldap.adm vert zelda.adm vert vert.adm.crans.org ldap.adm.crans.org
ForwardAgent yes
ProxyCommand ssh odlyd.crans.org -W %h:%p
+Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
+ HostName ytrap-llatsni.adm.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+ ProxyCommand ssh odlyd.crans.org -W %h:%p
+
Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
HostName zbee-idrac.adm.crans.org
User loginCr@ns