Merge with 0435926b6344e917455fcad6d9a270a614562178
authorRaphael Velt <raph.velt@gmail.com>
Mon, 19 Dec 2011 15:28:23 +0100
changeset 451 c223cae8db5b
parent 450 c964d7e6556e (current diff)
parent 449 a26d66b419ee (diff)
child 452 a408065d36e0
Merge with 0435926b6344e917455fcad6d9a270a614562178
tweetcast/server-gevent/tweetcast.py
--- 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
 
--- 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',