Merge branch 'master' into perso

[config-20-100.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 3e37672db6c2c53c8946222ab356adf426eb7241..194a05980abb2cb809155fb9b5421701d37e3103 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -288,7 +288,7 @@ Host appartement hackpartement appartement.crans.org hackpartement.crans.org
     User legallic
     ForwardAgent yes
 
-Host apprentis apprentis.crans.org
+Host apprentis munin-apprentis apprentis.crans.org munin-apprentis.crans.org
     HostName apprentis.crans.org
     User legallic
 
@@ -361,6 +361,16 @@ Host cochon.ferme cochon cochon television tv cochon.ferme.crans.org television.
     User legallic
     ForwardAgent yes
 
+Host cups cups.crans.org
+    HostName cups.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host cups.adm cups.adm.crans.org
+    HostName cups.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host dhcp dhcp.crans.org
     HostName dhcp.crans.org
     User legallic
@@ -406,11 +416,6 @@ Host ft ft.crans.org
     User legallic
     ForwardAgent yes
 
-Host ft-ilo ft-ilo.crans.org
-    HostName ft-ilo.crans.org
-    User legallic
-    ForwardAgent yes
-
 Host ft.adm ft.adm.crans.org
     HostName ft.adm.crans.org
     User legallic
@@ -441,7 +446,7 @@ Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
     User legallic
     ForwardAgent yes
 
-Host geet.adm git.adm geet.adm.crans.org git.adm.crans.org
+Host geet.adm git.adm gitlab.adm geet.adm.crans.org git.adm.crans.org gitlab.adm.crans.org
     HostName geet.adm.crans.org
     User legallic
     ForwardAgent yes
@@ -511,11 +516,6 @@ Host komaz.adm komaz.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host komaz.wifi komaz.wifi.crans.org
-    HostName komaz.wifi.crans.org
-    User legallic
-    ForwardAgent yes
-
 Host malloc malloc.crans.org
     HostName malloc.crans.org
     User legallic
@@ -566,7 +566,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org
     User legallic
     ForwardAgent yes
 
-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
+Host niomniom 15ans autoconfig 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 autoconfig.crans.org
     HostName niomniom.crans.org
     User legallic
     ForwardAgent yes
@@ -596,6 +596,11 @@ Host odlyd.adm upload.adm odlyd.adm.crans.org upload.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host odlyd.wifi odlyd.wifi.crans.org
+    HostName 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
@@ -606,6 +611,16 @@ Host oie.adm oie.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host omnomnom omnomnom.crans.org
+    HostName omnomnom.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host omnomnom.adm omnomnom.adm.crans.org
+    HostName omnomnom.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
     HostName owl.crans.org
     User legallic
@@ -616,6 +631,16 @@ Host owl.adm imap.adm pop.adm owl.adm.crans.org imap.adm.crans.org pop.adm.crans
     User legallic
     ForwardAgent yes
 
+Host owncloud owncloud.crans.org
+    HostName owncloud.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host owncloud.adm owncloud.adm.crans.org
+    HostName owncloud.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host pea pea.crans.org
     HostName pea.crans.org
     User legallic
@@ -641,12 +666,12 @@ Host puppet.adm puppet.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host redisdead lists smtp redisdead.crans.org lists.crans.org smtp.crans.org
+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 legallic
     ForwardAgent yes
 
-Host redisdead.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org
+Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org listes.adm.crans.org list.adm.crans.org liste.adm.crans.org
     HostName redisdead.adm.crans.org
     User legallic
     ForwardAgent yes
@@ -711,7 +736,7 @@ Host soyouz.adm soyoustart.adm soyouz.adm.crans.org soyoustart.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host ssh2 ssh2.crans.org
+Host ssh2 mosh ssh2.crans.org mosh.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
@@ -734,12 +759,12 @@ Host template.adm template.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host thot psuornotpsu thot.crans.org psuornotpsu.crans.org
+Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
     HostName thot.crans.org
     User legallic
     ForwardAgent yes
 
-Host thot.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org
+Host thot.adm logs.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org logs.adm.crans.org
     HostName thot.adm.crans.org
     User legallic
     ForwardAgent yes
@@ -799,7 +824,7 @@ Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
     User legallic
     ForwardAgent yes
 
-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
+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
     HostName zamok.crans.org
     User legallic
     ForwardAgent yes
@@ -834,6 +859,13 @@ Host eap.adm eap eap eap.adm.crans.org
     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 legallic
+    ForwardAgent yes
+    ProxyCommand ssh sable.crans.org -W %h:%p
+    HostKeyAlgorithms ssh-rsa
+
 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 legallic
@@ -971,7 +1003,7 @@ Host tahines.ens-cachan.fr tahines2 tahines
 # Machines du département informatique de l'ENSC
 # Accesibles aux A0
 
-Host dptinfo21.dptinfo.ens-cachan.fr info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
+Host info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr
     #HostName 138.231.36.60
     HostName ssh.dptinfo.ens-cachan.fr
     User vlegalli
@@ -989,6 +1021,7 @@ Host info*
     ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p
     ForwardAgent yes
 
+
 # +--------+
 # | Stages |
 # +--------+
@@ -998,6 +1031,7 @@ Host mars mars.lbpa mars.lbpa.ens-cachan.fr
     User vincent
     ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
 
+
 # +------+
 # | Labo |
 # +------+