Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers...

diff --git a/.bash_aliases b/.bash_aliases
index 4300e21850ec4e003d4cd1764c4915db7e5ca116..7ec88c04fdb1c193d32cd310e9c638a0275d791c 100644 (file)
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -159,7 +159,7 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
 alias tailprocmail='tail -f ~/.procmail/logs/procmail.log'
 
 # Pour réveiller la carte éthernet quand elle déconne
-alias rebooteth0='rmmod atl1c; modprobe atl1c'
+alias rebooteth0='rmmod atl1c; rmmod ath9k; modprobe atl1c; modprobe ath9k'
 
 
 # +------------+
@@ -184,3 +184,6 @@ alias tailftp='tail -n 100 -f /var/log/pure-ftpd/transfer.log | /home/vincent/sc
 
 # backup-manager
 alias uploadbackups='backup-manager --upload'
+
+# xclip fout pas dans le bon presse-papier par défaut
+alias xclip='xclip -selection clipboard'

diff --git a/.ssh/config b/.ssh/config
index db9e94324c4cc0a21780efce77aaf9e407c0aede..f465ad13079c841b6ab9fe09237501a7a3d7a05a 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -49,12 +49,27 @@ ServerAliveCountMax 3
 # ProxyCommand = pour passer par un autre serveur intermédiaire
 #                (pour un serveur qui ne peut pas être contacté directement)
 
-UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_hosts_dptinfo
+UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_hosts_dptinfo ~/.ssh/known_hosts_telecom_serveurs ~/.ssh/known_hosts_telecom_tp
 
 # +--------------+
 # | Mes machines |
 # +--------------+
 
+Host zeldrenviatahinesviapimeys
+    HostName zeldren.crans.org
+    User vincent
+    ProxyCommand ssh tahinesviapimeys -W %h:%p
+
+Host tahinesviapimeys
+    HostName tahines.ens-cachan.fr
+    User vlegalli
+    ProxyCommand ssh pimeys.fr -W %h:%p
+
+Host zeldren.crans.org zeldren
+    HostName zeldren.crans.org
+    User vincent
+    ForwardAgent yes
+
 Host cerebro.crans.org cerebro
     HostName cerebro.crans.org
     User vincent
@@ -87,8 +102,8 @@ Host evaw.home evaw
     ForwardAgent yes
     ProxyCommand ssh home.b2moo.fr -W %h:%p
 
-Host cabal.crans.org cabal.crans
-    HostName cabal.crans.org
+Host zeldren.crans.org cabal.crans zeldren
+    HostName zeldren.crans.org
     User vincent
     ForwardAgent yes
 
@@ -106,7 +121,13 @@ Host cabal.home cabal
     HostName 192.168.1.81
     User vincent
     ForwardAgent yes
-    ProxyCommand ssh home.b2moo.fr -W %h:%p
+    ProxyCommand ssh -4 home.b2moo.fr -W %h:%p
+
+Host cabalviabox
+    HostName home.b2moo.fr
+    Port 2222
+    User vincent
+    ForwardAgent yes
 
 Host cabalw.home cabalw
     HostName 192.168.1.63
@@ -1066,5 +1087,13 @@ Host mars mars.lbpa mars.lbpa.ens-cachan.fr
     User vincent
     ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p
 
+# +---------+
+# | Télécom |
+# +---------+
+
+Host rabban rabban.enst.fr
+    HostName rabban.enst.fr
+    User legallic
+
 # END (utile pour éviter les merge conflicts)