diff --git a/.ssh/config_crans b/.ssh/config_crans
index bc5b47e1d82a73eeeea336345fc8fe59581d9aed..2b8cbc8fec8d25ea7e67f83db72472f85c7bab92 100644
--- a/.ssh/config_crans
+++ b/.ssh/config_crans
@@ -33,6 +33,11 @@ Host backbone backbone.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 bakdaur bakdaur.crans.org
HostName bakdaur.crans.org
User loginCr@ns
@@ -43,11 +48,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 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
@@ -58,7 +58,7 @@ Host cas.adm cas.adm.crans.org
User loginCr@ns
ForwardAgent yes
-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 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
@@ -78,31 +78,11 @@ Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host cochon cochon.ferme television tv cochon.ferme.crans.org television.crans.org tv.crans.org cochon.crans.org
- HostName cochon.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 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
@@ -283,7 +263,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 crans.ens-cachan.fr crans.org doc i-p install-party 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 doc.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
@@ -308,16 +288,6 @@ Host odlyd.wifi odlyd.wifi.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
@@ -338,16 +308,6 @@ 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 proxy proxy.crans.org
HostName proxy.crans.org
User loginCr@ns
@@ -363,6 +323,16 @@ Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.ad
User loginCr@ns
ForwardAgent yes
+Host roundcube roundcube-srv roundcube.crans.org roundcube-srv.crans.org
+ HostName roundcube-srv.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+
+Host roundcube.adm roundcube.adm.crans.org
+ HostName roundcube.adm.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+
Host routeur deconnexion routeur.crans.org deconnexion.crans.org
HostName routeur.crans.org
User loginCr@ns
@@ -373,11 +343,6 @@ Host routeur.adm routeur.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host routeur-21 routeur-21.crans.org
- HostName routeur-21.crans.org
- User loginCr@ns
- ForwardAgent yes
-
Host silice silice.crans.org
HostName silice.crans.org
User loginCr@ns
@@ -416,11 +381,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 thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
HostName thot.crans.org
User loginCr@ns
@@ -456,11 +416,6 @@ 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
@@ -486,16 +441,6 @@ Host xmpp.adm jabber.adm xmpp.adm.crans.org jabber.adm.crans.org
User loginCr@ns
ForwardAgent yes
-Host ytrap-llatsni ytrap-llatsni.crans.org
- HostName ytrap-llatsni.crans.org
- User loginCr@ns
- ForwardAgent yes
-
-Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
- HostName ytrap-llatsni.adm.crans.org
- User loginCr@ns
- ForwardAgent yes
-
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
@@ -513,8 +458,14 @@ Host zamok.adm users.adm zamok.adm.crans.org users.adm.crans.org
# Accessibles aux apprentis, mais ne sont que sur le VLAN adm
# d'où la ProxyJump
-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
+ ProxyJump stitch.crans.org
+
+Host cups.adm cups.adm.crans.org
+ HostName cups.adm.crans.org
User loginCr@ns
ForwardAgent yes
ProxyJump stitch.crans.org
@@ -548,6 +499,12 @@ Host *-ilo
HostKeyAlgorithms ssh-rsa,ssh-dss
ProxyJump stitch.crans.org
+Host omnomnom.adm omnomnom.adm.crans.org
+ HostName omnomnom.adm.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+ ProxyJump stitch.crans.org
+
Host phabricator todo tracker.adm tracker.adm.crans.org
HostName tracker.adm.crans.org
User loginCr@ns
@@ -572,12 +529,6 @@ Host re2o-bcfg2 re2o-bcfg2.adm re2o-bcfg2.adm.crans.org bcfg2.adm bcfg2 bcfg2 bc
ForwardAgent yes
ProxyJump stitch.crans.org
-Host roundcube roundcube.adm roundcube.crans.org roundcube.adm.crans.org
- HostName roundcube.adm.crans.org
- User loginCr@ns
- ForwardAgent yes
- ProxyJump stitch.crans.org
-
Host slon.adm slon slon slon.adm.crans.org
HostName slon.adm.crans.org
User loginCr@ns
@@ -590,6 +541,12 @@ Host vert.adm ldap.adm vert zelda.adm vert vert.adm.crans.org ldap.adm.crans.org
ForwardAgent yes
ProxyJump stitch.crans.org
+Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
+ HostName ytrap-llatsni.adm.crans.org
+ User loginCr@ns
+ ForwardAgent yes
+ ProxyJump stitch.crans.org
+
Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
HostName zbee-idrac.adm.crans.org
User loginCr@ns