diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
| commit | 054fdbdf7a1e5106725b8b5a36db99242cfa65c1 (patch) | |
| tree | 1633b26e884feb1f29afedbb80cef7a6ecbdba2d /apache/django.wsgi | |
| parent | 8a5ba2650678ec22107a1a0a10650b6e0cc14683 (diff) | |
| parent | d02ec4246813eb0787bf3ab54af1af9ce32bd376 (diff) | |
| download | Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.tar.bz2 Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/static/chimere/js/jquery.chimere.js
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/utils.py
chimere/views.py
example_project/settings.py
Diffstat (limited to 'apache/django.wsgi')
| -rw-r--r-- | apache/django.wsgi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apache/django.wsgi b/apache/django.wsgi index 6227ee2..16758e6 100644 --- a/apache/django.wsgi +++ b/apache/django.wsgi @@ -1,5 +1,6 @@ import os, sys -sys.path.append('/var/local/django/chimere/') -os.environ['DJANGO_SETTINGS_MODULE'] = 'mychimere_project.settings' +MAIN_PATH = os.path.realpath(os.path.dirname(__file__)) + "/.." +sys.path.append(MAIN_PATH) +os.environ['DJANGO_SETTINGS_MODULE'] = 'mychimere_project.settings' # change with your project name import django.core.handlers.wsgi application = django.core.handlers.wsgi.WSGIHandler() |