Fix timeside cleanup

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 4ad87042df2d3e9e50cb6f750786e42be261d4bd..37568a0385dca4743c42a1757732e6928ae67351 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -40,7 +40,7 @@ python $manage telemeta-setup-enumerations
 
 
 # Delete Timeside database if it exists
-cat /srv/lib/telemeta/telemeta/bin/sql/drop_timeside.sql | python $manage dbshell
+cat /srv/lib/telemeta/bin/sql/drop_timeside.sql | python $manage dbshell
 
 if [ $REINDEX = "True" ]; then
     python $manage rebuild_index --noinput

diff --git a/app/settings.py b/app/settings.py
index 04651edc3d72cecc6859b1441bc79f19cc49eb84..88c335e175c57b9c6e430f9936652a8bb4b1ec1d 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -166,7 +166,7 @@ INSTALLED_APPS = (
     'django_extensions',
     'telemeta',
     'timeside.player',
-    # 'timeside.server',
+    'timeside.server',
     'jsonrpc',
     'sorl.thumbnail',
     'timezones',
@@ -180,7 +180,6 @@ INSTALLED_APPS = (
     'djcelery',
     'haystack',
     'djangobower',
-    # 'djng',
     'saved_searches',
 )