diff --git a/etc/nginx/vhost.in b/etc/nginx/vhost.in index d66d26e9..0708fe1a 100644 --- a/etc/nginx/vhost.in +++ b/etc/nginx/vhost.in @@ -1,11 +1,15 @@ server { + #make sure to add + # application/json json; + #to /etc/nginx/mime.types + #those need to go into /etc/nginx/nginx.conf in the http section #gzip on; #gzip_http_version 1.1; #gzip_vary on; #gzip_comp_level 6; #gzip_proxied any; - #gzip_types text/plain text/css text/json text/xml application/json application/xml application/xml+rss text/javascript application/javascript; + #gzip_types text/plain text/css application/json text/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript text/x-js; #gzip_buffers 16 8k; #gzip_disable "MSIE [1-6]\.(?!.*SV1)"; diff --git a/pandora/annotation/tasks.py b/pandora/annotation/tasks.py index 0a7c28e5..b8bf31a2 100644 --- a/pandora/annotation/tasks.py +++ b/pandora/annotation/tasks.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 -from celery.decorators import task +from celery.task import task diff --git a/pandora/app/tasks.py b/pandora/app/tasks.py index 3ac03816..f665620a 100644 --- a/pandora/app/tasks.py +++ b/pandora/app/tasks.py @@ -2,7 +2,7 @@ # vi:si:et:sw=4:sts=4:ts=4 import datetime -from celery.decorators import task, periodic_task +from celery.task import task, periodic_task from celery.task.schedules import crontab diff --git a/pandora/archive/tasks.py b/pandora/archive/tasks.py index fcc392bf..c31260da 100644 --- a/pandora/archive/tasks.py +++ b/pandora/archive/tasks.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # vi:si:et:sw=4:sts=4:ts=4 -from celery.decorators import task +from celery.task import task import ox from django.conf import settings diff --git a/pandora/event/tasks.py b/pandora/event/tasks.py index d00c7e11..7938ecb7 100644 --- a/pandora/event/tasks.py +++ b/pandora/event/tasks.py @@ -2,7 +2,7 @@ # vi:si:et:sw=4:sts=4:ts=4 from datetime import timedelta -from celery.decorators import task, periodic_task +from celery.task import task, periodic_task from celery.task.schedules import crontab diff --git a/pandora/item/tasks.py b/pandora/item/tasks.py index f1a7dacc..491be06a 100644 --- a/pandora/item/tasks.py +++ b/pandora/item/tasks.py @@ -2,7 +2,7 @@ # vi:si:et:sw=4:sts=4:ts=4 from datetime import timedelta -from celery.decorators import task, periodic_task +from celery.task import task, periodic_task import models diff --git a/pandora/place/tasks.py b/pandora/place/tasks.py index b8d36ee6..b1a47c93 100644 --- a/pandora/place/tasks.py +++ b/pandora/place/tasks.py @@ -2,7 +2,7 @@ # vi:si:et:sw=4:sts=4:ts=4 from datetime import timedelta -from celery.decorators import task, periodic_task +from celery.task import task, periodic_task from celery.task.schedules import crontab import models