# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1324304903 -3600
# Node ID c223cae8db5b550af665d9254a2db974f272bfe9
# Parent  c964d7e6556e2535702f4fd66727aaa1c14f8901# Parent  a26d66b419ee845223e371b197f523f8aff4214b
Merge with 0435926b6344e917455fcad6d9a270a614562178

diff -r c964d7e6556e -r c223cae8db5b sbin/sync/sync_tweetcast
--- a/sbin/sync/sync_tweetcast	Mon Dec 19 15:22:07 2011 +0100
+++ b/sbin/sync/sync_tweetcast	Mon Dec 19 15:28:23 2011 +0100
@@ -11,7 +11,8 @@
 if [ -d ~/tmp/tweet_live_V$1 ]; then
     cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/tweet_live_V$1/tweetcast/server-gevent/ iri@www.iri.centrepompidou.fr:/home/polemictweet-nginx/server-gevent
 + core
-P server_setup.py
+P server-gevent/server_setup.py
+P **/server_setup.py
 EOT
 fi
 
diff -r c964d7e6556e -r c223cae8db5b tweetcast/server-gevent/tweetcast.py
diff -r c964d7e6556e -r c223cae8db5b web/enmi2011/config.php
--- a/web/enmi2011/config.php	Mon Dec 19 15:22:07 2011 +0100
+++ b/web/enmi2011/config.php	Mon Dec 19 15:28:23 2011 +0100
@@ -71,7 +71,7 @@
 	'player_height' => 488,
 	
     // New Tweet live parameters
-    'use_tweetcast' => true,
+    'use_tweetcast' => false,
     'js_config' => "
     var connect_type = 'gevent',
     source_address = 'http://polemictweet.com/tweetcast-proxy.php',