X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=blobdiff_plain;f=.ssh%2Fconfig;fp=.ssh%2Fconfig;h=271af7a2d3bab96f0dfcdb1cba12dd200ccc3e2c;hp=96ca5820f0897adbd62edd935a487226a0654f7f;hb=0a492655b7e30ab9949bbfe0d76955fa125eecba;hpb=abb200aab6a1c1c2f41ca603c902f381c2eca725

diff --git a/.ssh/config b/.ssh/config
index 96ca582..271af7a 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -10,7 +10,8 @@
 
 # À 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 "loginCr@ns", "loginFedeRez" et "loginENS" par les login idoines
+# Pensez à remplacer "loginCr@ns", "loginFedeRez", "loginBDE" et "loginENS" par
+# les logins idoines.
 
 #------------------------------------------------------------------------------
 
@@ -179,66 +180,6 @@ Host pimeys pimeys.fr becue.eu
     ForwardAgent yes
 
 
-# +-----------------+
-# | Machines du BDE |
-# +-----------------+
-# Parce que j'étais respo-info Makiavé[list]
-
-Host kfet kfet.crans.org
-    HostName kfet.crans.org
-    User bde
-    # IPv4 only
-    AddressFamily inet
-    ForwardAgent yes
-
-Host kfet-secours kfet-secours.crans.org
-    HostName kfet-secours.crans.org
-    User bde
-    # IPv4 only
-    AddressFamily inet
-
-Host kfet2 kfet2.crans.org
-    HostName kfet2.crans.org
-    User vincent
-
-Host bde-test note-test bde-test.crans.org note-test.crans.org
-    HostName bde-test.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host bde2 bde-fallback bde2.crans.org ldap-bde.crans.org bde-fallback.crans.org
-    HostName bde2.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host bde3 bde3.crans.org
-    HostName bde3.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host note bde2-virt bde ldap-bde note.crans.ort bde2-virt.crans.org bde.crans.org
-    HostName bde2-virt.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host note bde3-virt bde note.crans.ort bde3-virt.crans.org bde.crans.org
-    HostName bde3-virt.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host video videobde videobde.crans.org
-    HostName videobde.crans.org
-    User vincent
-    ForwardAgent yes
-
-Host bureau bureau-bde bureau-bde.crans.org
-    HostName bureau-bde.crans.org
-    User bde
-
-Host med zavoyarde med.crans.org zavoyarde.crans.org
-    HostName zavoyarde.crans.org
-    User vincent
-
 # +----+
 # | PE |
 # +----+
@@ -262,16 +203,11 @@ Host ruoska ruoska.crans.org
 # +-----+
 # Parce que j'y suis le bienvenu
 
-# Le ftp de Nit, gère A♡-TV. 
+# Le ftp de Nit
 Host power power.crans.org nit-git nit-git.crans.org
     HostName power.crans.org
     User vincent
 
-# Réplicat du wikoeur
-Host genua acoeur.genua.fr
-    HostName acoeur.genua.fr
-    User root
-    AddressFamily inet6
 
 # +----+
 # | A♡ |
@@ -283,6 +219,52 @@ Host acoeur acoeur.crans.org
     User vincent
     ForwardAgent yes
 
+
+# +-----------------+
+# | Serveurs du BDE |
+# +-----------------+
+# Serveurs du BDE accessibles aux respos info
+
+Host kfet kfet.crans.org kfet1
+    HostName kfet.crans.org
+    User bde
+    ForwardAgent yes
+
+Host kfet-bureau kfet-bureau.crans.org bureau bureau-bde
+    HostName kfet.crans.org
+    User bde
+    ForwardAgent yes
+
+Host bde2 bde2-virt note note-virt kfet-ics doc-bde ldap-bde bde2.crans.org bde2-virt.crans.org note.crans.org
+    HostName bde2-virt.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host bde3-virt digicode bde3-virt.crans.org
+    HostName bde3-virt.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host bde3 bde3.crans.org
+    HostName bde3.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host bde-test bde-test-virt note-test note-dev bde-test.crans.org bde-test-virt.crans.org note-test.crans.org
+    HostName bde-test-virt.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host sauron sauron.crans.org
+    HostName sauron.crans.org
+    User vincent
+    ForwardAgent yes
+
+Host med zavoyarde med.crans.org zavoyarde.crans.org
+    HostName zavoyarde.crans.org
+    User vincent
+
+
 # +-------------------+
 # | Serveurs du Cr@ns |
 # +-------------------+
@@ -328,6 +310,16 @@ Host backbone.adm backbone.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host bakdaur bakdaur.crans.org
+    HostName bakdaur.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host bakdaur.adm bakdaur.adm.crans.org
+    HostName bakdaur.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host backbone.wifi backbone.wifi.crans.org
     HostName backbone.wifi.crans.org
     User legallic
@@ -337,8 +329,8 @@ Host batk-0 batk-0.crans.org
     HostName batk-0.crans.org
     User legallic
 
-Host cas auth login cas.crans.org login.crans.org auth.crans.org
-    HostName cas.crans.org
+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 legallic
     ForwardAgent yes
 
@@ -402,6 +394,11 @@ Host dhcp.adm dhcp.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host discourse discourse-srv discourse.crans.org discourse-srv.crans.org
+    HostName discourse-srv.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host dyson dyson.crans.org
     HostName dyson.crans.org
     User legallic
@@ -412,8 +409,8 @@ Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host ethercalc ethercalc.crans.org
-    HostName ethercalc.crans.org
+Host ethercalc ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org
+    HostName ethercalc-srv.crans.org
     User legallic
     ForwardAgent yes
 
@@ -427,6 +424,16 @@ Host freebox freebox.crans.org
     User legallic
     ForwardAgent yes
 
+Host frontdaur frontdaur.crans.org
+    HostName frontdaur.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host frontdaur.adm frontdaur.adm.crans.org
+    HostName frontdaur.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host ft ft.crans.org
     HostName ft.crans.org
     User legallic
@@ -437,7 +444,7 @@ Host ft.adm ft.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host fy munin fy.crans.org munin.crans.org
+Host fy munin icinga2 weathermap fy.crans.org munin.crans.org icinga2.crans.org weathermap.crans.org
     HostName fy.crans.org
     User legallic
     ForwardAgent yes
@@ -467,7 +474,7 @@ Host geet.adm git.adm gitlab.adm geet.adm.crans.org git.adm.crans.org gitlab.adm
     User legallic
     ForwardAgent yes
 
-Host horde webmail horde.crans.org webmail.crans.org
+Host horde horde-srv webmail horde.crans.org horde-srv.crans.org webmail.crans.org
     HostName horde.crans.org
     User legallic
     ForwardAgent yes
@@ -542,7 +549,7 @@ Host malloc.adm malloc.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host mediadrop video mediadrop.crans.org video.crans.org
+Host mediadrop mediadrop-srv video mediadrop.crans.org video.crans.org mediadrop-srv.crans.org video-srv.crans.org
     HostName mediadrop.crans.org
     User legallic
     ForwardAgent yes
@@ -647,7 +654,7 @@ 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
+Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org
     HostName owncloud.crans.org
     User legallic
     ForwardAgent yes
@@ -672,6 +679,11 @@ Host pegase pegase.crans.org
     User legallic
     ForwardAgent yes
 
+Host proxy proxy.crans.org
+    HostName proxy.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host puppet puppet.crans.org
     HostName puppet.crans.org
     User legallic
@@ -722,7 +734,7 @@ Host routeur.adm routeur.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host sable dns proxy sable.crans.org proxy.crans.org dns.crans.org
+Host sable dns sable.crans.org dns.crans.org
     HostName sable.crans.org
     User legallic
     ForwardAgent yes
@@ -732,7 +744,7 @@ Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host sogo sogo.crans.org
+Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org
     HostName sogo.crans.org
     User legallic
     ForwardAgent yes
@@ -760,6 +772,16 @@ Host ssh2 mosh ssh2.crans.org mosh.crans.org
     User legallic
     ForwardAgent yes
 
+Host stitch stitch.crans.org
+    HostName stitch.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host stitch.adm stitch.adm.crans.org
+    HostName stitch.adm.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host stun-secondary stun-secondary.crans.org
     HostName stun-secondary.crans.org
     User legallic
@@ -775,6 +797,16 @@ Host template.adm template.adm.crans.org
     User legallic
     ForwardAgent yes
 
+Host test1 test1.crans.org
+    HostName test1.crans.org
+    User legallic
+    ForwardAgent yes
+
+Host test2 test2.crans.org
+    HostName test2.crans.org
+    User legallic
+    ForwardAgent yes
+
 Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
     HostName thot.crans.org
     User legallic
@@ -795,7 +827,7 @@ Host titanic.adm titanic.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host tracker todo tracker.crans.org todo.crans.org
+Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
     HostName tracker.crans.org
     User legallic
     ForwardAgent yes
@@ -1021,7 +1053,7 @@ Host *.dptinfo !ssh.dptinfo
 Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr
     HostName %h
     User vlegalli
-    ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p
+    ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p
     ForwardAgent yes