Merge branch 'master' of https://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury.wsgi.template

diff --git a/wolnelektury.wsgi.template b/wolnelektury.wsgi.template
index 3437e8f..033bab1 100644 (file)
--- a/wolnelektury.wsgi.template
+++ b/wolnelektury.wsgi.template
@@ -1,6 +1,6 @@
 #!%(python)s
 import site
 #!%(python)s
 import site

-site.addsitedir('%(path)s/lib/python2.5/site-packages')
+site.addsitedir('%(path)s/ve/lib/python2.6/site-packages')

 
 import os
 from os.path import abspath, dirname, join
 
 import os
 from os.path import abspath, dirname, join


@@ -10,9 +10,6 @@ import sys
 # print statements for optional import exceptions.
 sys.stdout = sys.stderr
 
 # print statements for optional import exceptions.
 sys.stdout = sys.stderr
 

-# we don't want these packages to cover our virtualenv
-sys.path = [p for p in sys.path if not p.startswith('/usr/lib/python2.5/site-packages') and not p.startswith('/var/lib/python-support/python2.5')]
-

 # Add apps and lib directories to PYTHONPATH
 sys.path = [
        '%(path)s/releases/current/%(project_name)s',
 # Add apps and lib directories to PYTHONPATH
 sys.path = [
        '%(path)s/releases/current/%(project_name)s',


@@ -23,6 +20,7 @@ sys.path = [
 ] + sys.path
 
 # Run Django
 ] + sys.path
 
 # Run Django

+os.environ["CELERY_LOADER"] = "django"

 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 from django.core.handlers.wsgi import WSGIHandler
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 from django.core.handlers.wsgi import WSGIHandler