From 73b19705a8bb30509c0878fb250ac33f8136d16b Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 18 Mar 2015 23:36:02 +0100
Subject: [PATCH] fix db and celery script, add timeside urls

---
 Dockerfile                   | 3 ++-
 docker-compose.yml           | 2 +-
 examples/sandbox/settings.py | 2 +-
 setup.py                     | 4 ++--
 telemeta/urls.py             | 2 ++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 65be1b9d..727be973 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM parisson/timeside-diadems:latest-dev
+# FROM parisson/timeside:latest-dev
+FROM timeside_app
 
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@parisson.com>
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 205cf7f5..6cb690e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,7 +72,7 @@ worker:
   build: .
   volumes_from:
     - home
-  command: /bin/sh /opt/TimeSide/examples/deploy/celery_app.sh
+  command: /bin/sh /opt/Telemeta/examples/deploy/celery_app.sh
   links:
     - rabbitmq
     - db
diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index d1681fb7..97cf812d 100644
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -33,7 +33,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'USER': 'root',      # Not used with sqlite3.
         'PASSWORD': 'mysecretpassword',  # Not used with sqlite3.
-        'NAME': 'timeside',
+        'NAME': 'telemeta',
         'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '3306',      # Set to empty string for default. Not used with sqlite3.
     }
diff --git a/setup.py b/setup.py
index 80d0be51..92390c0e 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,7 @@ class PyTest(TestCommand):
         errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
+
 CLASSIFIERS = ['Environment :: Web Environment',
 'Framework :: Django',
 'Intended Audience :: Science/Research',
@@ -62,6 +63,7 @@ setup(
         'django-suit',
         'django-google-tools',
         'django-ipauth',
+        'django-celery',
         'timeside>=0.7',
         'south',
         'sorl-thumbnail',
@@ -69,13 +71,11 @@ setup(
         'psutil',
         'pyyaml',
         'python-ebml',
-        # 'mysql',
         'zipstream',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
   # Provide a test command through django-setuptest
   cmdclass={'test': PyTest},
-  dependency_links = ['https://github.com/yomguy/django-json-rpc/tarball/0.6.2#egg=django-json-rpc-0.6.2'],
   platforms=['OS Independent'],
   license='CeCILL v2',
   classifiers = CLASSIFIERS,
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 8550588b..dc292e0a 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -230,6 +230,8 @@ urlpatterns = patterns('',
 
     url(r'^', include('jqchat.urls')),
 
+    url(r'^timeside/', include('timeside.server.urls')),
+
 )
 
 
-- 
2.39.5