Update 'ssh_config'

ssh_config

@@ -1,142 +1,113 @@
-# Generalities ---------------------------------------------------------
+# Generalities ------------------------------------------------------------------------------------
 
 Host *
-    ForwardAgent yes 
-    ForwardX11 yes 
     ServerAliveInterval 60
 
-# Gateways -------------------------------------------------------------
+# Gateways ----------------------------------------------------------------------------------------
+
+Host gwelic gwcism gwceci
+    User my_login
+    ForwardX11 yes
+    IdentityFile ~/.ssh/id_rsa.ceci
 
 Host gwelic
-    User jsmith
     Hostname www.climate.be
-    IdentityFile ~/.ssh/id_rsa
-Host *%gwelic
-    ProxyCommand ssh -q -W %h:%p gwelic
 Host gwcism
-    User jsmith
     Hostname gwcism.cism.ucl.ac.be
-Host *%gwcism
-    ProxyCommand ssh -W %h:%p gwcism
 Host gwceci
-    User jsmith
     Hostname gwceci.cism.ucl.ac.be
-    IdentityFile ~/.ssh/id_rsa.ceci
+
+# Jump --------------------------------------------------------------------------------------------
+
+Host *%gwelic
+    ProxyJump gwelic
+Host *%gwcism
+    ProxyJump gwcism
 Host *%gwceci
-    ProxyCommand ssh -W %h:%p gwceci
+    ProxyJump gwceci
 
-# ELIC -----------------------------------------------------------------
+# ELIC ---------------------------------------------------------------------------------------------
 
-Host lorenz*
+Host *meteor* *lorenz* *aurora* *storm* *pelican* *coriolis* *cyclone*
+    ForwardX11 yes
+    User my_login
+    IdentityFile ~/.ssh/id_rsa.ceci
+
+Host *cyclone*
+    HostName cyclone.elic.ucl.ac.be
+Host *cyclone%gwelic
+Host *cyclone%gwcism
+Host *coriolis*
+    HostName coriolis.elic.ucl.ac.be
+Host *coriolis%gwelic
+Host *coriolis%gwcism
+Host *meteor*
+    HostName meteor.elic.ucl.ac.be
+Host *meteor%gwelic
+Host *meteor%gwcism
+Host *lorenz*
     HostName lorenz.elic.ucl.ac.be
-    User jsmith
-Host lorenz%gwelic
-Host lorenz%gwcism
-Host lorenz%gwceci
-Host elixir*
-    HostName elixir.elic.ucl.ac.be
-    User jsmith
-Host elixir%gwelic
-Host elixir%gwcism
-Host elixir%gwceci
-Host pingo*
+Host *lorenz%gwelic
+Host *lorenz%gwcism
+Host *aurora*
     HostName aurora.elic.ucl.ac.be
-    User jsmith
-Host aurora%gwelic
-Host aurora%gwcism
-Host aurora%gwceci
-Host storm*
+Host *aurora%gwelic
+Host *aurora%gwcism
+Host *storm*
     HostName storm.elic.ucl.ac.be
-    User jsmith
-Host storm%gwcism
-Host storm%gwelic
-Host storm%gwceci
-Host ozone*
-    HostName ozone.elic.ucl.ac.be
-    User jsmith
-Host ozone%gwcism
-Host ozone%gwelic
-Host ozone%gwceci
-
-Host regit*
-    User git
-    Hostname www.climate.be
-    Port 3022
-    Proxycommand ssh -xaqW %h:%p gwceci
-Host egit*
+Host *storm%gwcism
+Host *storm%gwelic
+Host *pelican*
+    HostName pelican.cism.ucl.ac.be
+Host *pelican%gwcism
+Host *pelican%gwelic
+
+# Git ---------------------------------------------------------------------------------------------
+
+Host gogs*
     User git
+    IdentityFile ~/.ssh/id_rsa.ceci
     Hostname www.climate.be
+    ForwardX11 no
+    ForwardX11Trusted no
     Port 3022
+    ProxyCommand ssh -i ~/.ssh/id_rsa.ceci gwceci.cism.ucl.ac.be -W %h:%p
 
-# Tier-1 ---------------------------------------------------------------
+# Tier-1 ------------------------------------------------------------------------------------------
 
 Host zenobe*
-    User jsmith
+    User my_login
+    ForwardX11 yes
     Hostname zenobe.hpc.cenaero.be
     IdentityFile ~/.ssh/id_rsa.ceci
-    ServerAliveInterval 240
-Host zenobe%gwcism
-Host zenobe%gwelic
+    ProxyCommand ssh -i ~/.ssh/id_rsa.ceci gwcism.cism.ucl.ac.be -W %h:%p
 
-# CÉCI clusters --------------------------------------------------------
+# CÉCI clusters -----------------------------------------------------------------------------------
 
-Host hmem lemaitre3 manneback hercules dragon1 vega nic4
+Host hmem hercules dragon1 vega nic5 lemaitre3 manneback
+    User my_login
+    ForwardX11 yes
     IdentityFile ~/.ssh/id_rsa.ceci
+    ProxyCommand ssh -i ~/.ssh/id_rsa.ceci gwceci.cism.ucl.ac.be -W %h:%p
 
-Host manneback*
-    HostName manneback.cism.ucl.ac.be
-    User jsmith
-Host manneback%gwcism
-Host manneback%gwceci
-Host hmem*
+Host hmem
     HostName hmem.cism.ucl.ac.be
-    User jsmith
-Host hmem%gwcism
-Host hmem%gwceci
-Host lemaitre3*
+Host lemaitre3
     HostName lemaitre3.cism.ucl.ac.be
-    User jsmith
-Host lemaitre3%gwcism
-Host lemaitre3%gwceci
-Host vega*
+Host vega
     HostName vega.ulb.ac.be
-    User jsmith
-Host vega%gwcism
-Host vega%gwceci
-Host nic4*
-    HostName nic4.segi.ulg.ac.be
-    User jsmith
-Host nic4%gwcism
-Host nic4%gwceci
+Host nic5
+    HostName nic5.segi.ulg.ac.be
 Host hercules
     Hostname hercules.ptci.unamur.be
-    User jsmith
-Host hercules%gwcism
-Host hercules%gwceci
 Host dragon1
     Hostname dragon1.umons.ac.be
-    User jsmith
-Host dragon1%gwcism
-Host dragon1%gwceci
+Host manneback
+    HostName manneback.cism.ucl.ac.be
 
-# CISM clusters --------------------------------------------------------
+# CISM clusters -----------------------------------------------------------------------------------
 
-Host pelican*
-    HostName pelican.cism.ucl.ac.be
-    User jsmith
-Host pelican%gwcism
-Host pelican%gwelic
-Host pelican%gwceci
 Host storage*
     HostName storage.cism.ucl.ac.be
-    User jsmith
-Host storage%gwcism
-Host storage%gwelic
-Host storage%gwceci
-
-# PRIVATE --------------------------------------------------------------
-
-Host mymachine*
-    HostName mymachine.elic.ucl.ac.be
-    User jsmith
-Host mymachine%gwelic
+    User my_login
+Host storage%gwcism