From: Vincent Le Gallic <legallic@crans.org>
Date: Tue, 7 Jun 2016 01:26:30 +0000 (+0200)
Subject: Merge branch 'master' into perso
X-Git-Url: http://gitweb.pimeys.fr/?p=config-20-100.git;a=commitdiff_plain;h=9a2de0d3ca9e4adfe1edaff417f7e9febccd95a4

Merge branch 'master' into perso

Conflicts:
	.ssh/config
---

9a2de0d3ca9e4adfe1edaff417f7e9febccd95a4
diff --cc .ssh/config
index 4150eb4,49f64a0..425c67c
--- a/.ssh/config
+++ b/.ssh/config
@@@ -968,46 -790,46 +968,55 @@@ Host zbee.adm fx.adm nfs.adm zbee zbee 
      ProxyCommand ssh sable.crans.org -W %h:%p
  
  
 -#~# # +---------+
 -#~# # | FedeRez |
 -#~# # +---------+
 -#~# # Accessibles aux membres de l'équipe d'admin de FedeRez
 -#~# 
 -#~# Host hexagon hexagon.federez.net
 -#~#     HostName hexagon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host quigon quigon.federez.net
 -#~#     HostName quigon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host nonagon nonagon.federez.net
 -#~#     HostName nonagon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host octogon octogon.federez.net
 -#~#     HostName octogon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host pentagon pentagon.federez.net
 -#~#     HostName pentagon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host parangon parangon.federez.net
 -#~#     HostName parangon.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 -#~# Host federez-test federez-test.federez.net
 -#~#     HostName federez-test.federez.net
 -#~#     User loginFedeRez
 -#~#     ForwardAgent yes
 -#~# 
 +# +---------+
 +# | FedeRez |
 +# +---------+
 +# Accessibles aux membres de l'équipe d'admin de FedeRez
 +
- # Actuellement down, mais on ne sait jamais
- Host nautilus nautilus.federez.net
-     HostName nautilus.federez.net
-     User legallic
-     ForwardAgent yes
- 
- Host forge forge.federez.net baldrick.federez.net baldrick baldrick.crans.org
-     HostName baldrick.federez.net
-     User legallic
++Host hexagon hexagon.federez.net
++    HostName hexagon.federez.net
++    User loginFedeRez
 +    ForwardAgent yes
 +
 +Host quigon quigon.federez.net
 +    HostName quigon.federez.net
-     User legallic
++    User loginFedeRez
 +    ForwardAgent yes
 +
- Host polygon polygon.federez.net
-     HostName polygon.federez.net
-     User legallic
++Host nonagon nonagon.federez.net
++    HostName nonagon.federez.net
++    User loginFedeRez
 +    ForwardAgent yes
 +
- Host hexagon hexagon.federez.net
-     HostName hexagon.federez.net
-     User legallic
++Host octogon octogon.federez.net
++    HostName octogon.federez.net
++    User loginFedeRez
++    ForwardAgent yes
++
++Host pentagon pentagon.federez.net
++    HostName pentagon.federez.net
++    User loginFedeRez
++    ForwardAgent yes
++
++Host parangon parangon.federez.net
++    HostName parangon.federez.net
++    User loginFedeRez
++    ForwardAgent yes
++
++Host federez-test federez-test.federez.net
++    HostName federez-test.federez.net
++    User loginFedeRez
 +    ForwardAgent yes
 +
 +
 +# +---------+
 +# | RezoSup |
 +# +---------+
 +# Réseau IRC des grandes écoles
 +
 +Host oswaft oswaft.rezosup.net
 +    HostName oswaft.rezosup.net
 +    User vincent
  
  
  # +-------------------+