From: Vincent Le Gallic Date: Fri, 6 Sep 2013 22:48:52 +0000 (+0200) Subject: Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers... X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=c35e26dd377ef045270f7b634ad9bed7ac694b77;hp=fd91e968272ded4025b1e6e1f9d14ef897363732;p=config-20-100.git Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso --- diff --git a/.procmailrc b/.procmailrc index 5cf964f..f7d5658 100644 --- a/.procmailrc +++ b/.procmailrc @@ -258,6 +258,7 @@ MLCLUBSDIR="${MLCAMPUSDIR}.Clubs" MLMEDDIR="${MLCLUBSDIR}.Med" MLBDLDIR="${MLCAMPUSDIR}.BDL" MLBDADIR="${MLCAMPUSDIR}.BDA" +MLBDSDIR="${MLCAMPUSDIR}.BDS" MLSDADIR="${MLCAMPUSDIR}.SDA" MLGALADIR="${MLCAMPUSDIR}.Gala" MLSONODIR="${MLCAMPUSDIR}.SoNo" @@ -858,6 +859,11 @@ INCLUDERC="${CONFIGDIR}/custom.normal.rules" * ? echo "${ML}" | egrep "(bdl|interludes)" ${MLBDLDIR}.${ML_}/ + # MLs BDS + :0 + * ? echo "${ML}" | egrep "bds" + ${MLBDSDIR}.${ML_}/ + # MLs Gala :0 * ? echo "${ML}" | egrep "(gala|geec)" diff --git a/.ssh/config b/.ssh/config index 948571e..04f9bd2 100644 --- a/.ssh/config +++ b/.ssh/config @@ -865,6 +865,7 @@ Host hexagon hexagon.federez.net Host tselin tselin.clietu tselin.clietu.ens-cachan.fr acces1.rip.ens-cachan.fr acces1 rip HostName tselin.clietu.ens-cachan.fr User vlegalli + ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p Host tahines.ens-cachan.fr tahines2 tahines HostName tahines.ens-cachan.fr