Merge branch 'perso' into taf

Conflicts:
	.ssh/config

diff --git a/.bash_aliases b/.bash_aliases
index 8fc8c1a66ebf1f62da9d85cc5ff171983b2cda7d..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'
 
 
 # +------------+

diff --git a/.procmail/rc/custom.normal.rules b/.procmail/rc/custom.normal.rules
index 3f3826d93d13ddd6407109ba51cf576b2de30f53..3297011658519d2d17dee091f381526b576c3759 100644 (file)
--- a/.procmail/rc/custom.normal.rules
+++ b/.procmail/rc/custom.normal.rules
@@ -95,6 +95,7 @@ ${HOTMAILDIR}/
 * ^(To|Cc):.*(legallic|vincent.legallic)@lri\.fr
 ${LRIDIR}/
 
+
 #################################################################
 ##       MLs qui ne suivent pas le comportement général        ##
 #################################################################
@@ -130,6 +131,7 @@ ${PCIDIR}/
 * ^List-Id:.*td2-immuno-2013\.lists\.crans\.org
 ${TDIMMUNODIR}/
 
+
 #################################################################
 ##                     Notifications wikis                     ##
 #################################################################
@@ -154,6 +156,16 @@ ${WIKISDIR}.FedeRez/
 * ^X-Wikia-Id: 98315
 ${WIKISDIR}.Twinsunpedia/
 
+
+#################################################################
+## Abrutis qui utilisent des List-Id mais ne sont pas des MLs  ##
+#################################################################
+### Allianz
+
+:0
+* ^List-Id:.*\.allianzfr\.
+.0_inbox/
+
 #################################################################
 ##                  Expéditeurs particuliers                   ##
 #################################################################

diff --git a/.ssh/config b/.ssh/config
index d2ee7b5b776023035498f7cd8e4dcc04c8d56b8d..28938119f747f4573a9669a814837693de42f58a 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -55,6 +55,16 @@ UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_host
 # | 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
@@ -92,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
 
@@ -113,6 +123,12 @@ Host cabal.home cabal
     ForwardAgent yes
     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
     User vincent
@@ -750,16 +766,6 @@ Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org
-    HostName sogo.crans.org
-    User legallic
-    ForwardAgent yes
-
-Host sogo.adm sogo.adm.crans.org
-    HostName sogo.adm.crans.org
-    User legallic
-    ForwardAgent yes
-
 Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
     HostName soyouz.crans.org
     User legallic
@@ -899,24 +905,24 @@ Host babar.adm babar babar babar.adm.crans.org
     HostName babar.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
     HostName bcfg2.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host eap.adm eap eap eap.adm.crans.org
     HostName eap.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host kdell-idrac.adm kdell-idrac kdell-idrac kdell-idrac.adm.crans.org
     HostName kdell-idrac.adm.crans.org
     User root
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host *-ilo
     HostName %h.adm.crans.org
@@ -934,44 +940,44 @@ Host *-ilo
     MACs hmac-md5,hmac-sha1
     Ciphers aes128-cbc,3des-cbc
     HostKeyAlgorithms ssh-rsa,ssh-dss
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host radius.adm radius radius radius.adm.crans.org
     HostName radius.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host sable-ilo.adm sable-ilo sable-ilo sable-ilo.adm.crans.org
     HostName sable-ilo.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
     HostKeyAlgorithms ssh-rsa
 
 Host slon.adm slon slon slon.adm.crans.org
     HostName slon.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host vert.adm ldap.adm vert zelda.adm vert vert.adm.crans.org ldap.adm.crans.org zelda.adm.crans.org
     HostName vert.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
     HostName zbee-idrac.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 Host zbee.adm fx.adm nfs.adm zbee zbee zbee.adm.crans.org nfs.adm.crans.org fx.adm.crans.org
     HostName zbee.adm.crans.org
     User legallic
     ForwardAgent yes
-    ProxyCommand ssh sable.crans.org -W %h:%p
+    ProxyCommand ssh redisdead.crans.org -W %h:%p
 
 
 # +---------+
@@ -1081,6 +1087,14 @@ 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)
 
 # +---------+