Commit 3a726ee5 authored by Administrator's avatar Administrator

[BUG FIX] big documents should not be in /srv/ but in /var. Thx.

parent 6f403681
...@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/ ...@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os import os
BASE_DIR = os.path.dirname(os.path.dirname(__file__)) BASE_DIR = os.path.dirname(os.path.dirname(__file__))
PROJECT_PATH = BASE_DIR PROJECT_PATH = os.path.join(BASE_DIR, os.pardir)
PROJECT_PATH = os.path.abspath(PROJECT_PATH) PROJECT_PATH = os.path.abspath(PROJECT_PATH)
import djcelery import djcelery
...@@ -36,7 +36,13 @@ TEMPLATE_DIRS = ( ...@@ -36,7 +36,13 @@ TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes # Always use forward slashes
# Don't forget to use absolute paths, not relative paths. # Don't forget to use absolute paths, not relative paths.
os.path.join(PROJECT_PATH, 'templates'), '/srv/gargantext/templates',
#import os.path
#
#TEMPLATE_DIRS = (
# os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
#)
) )
...@@ -115,10 +121,11 @@ USE_TZ = True ...@@ -115,10 +121,11 @@ USE_TZ = True
ROOT_URLCONF = 'gargantext_web.urls' ROOT_URLCONF = 'gargantext_web.urls'
# STATIC_ROOT = os.path.join(PROJECT_PATH, '') STATIC_ROOT = '/var/www/gargantext/static/'
STATIC_URL = '/static/' STATIC_URL = '/static/'
MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media') MEDIA_ROOT = '/var/www/gargantext/media'
#MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
...@@ -129,8 +136,11 @@ STATICFILES_FINDERS = ( ...@@ -129,8 +136,11 @@ STATICFILES_FINDERS = (
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(PROJECT_PATH, 'static'), #os.path.join(BASE_DIR, "static"),
) '/srv/gargantext/static',
#'/var/www/www/alexandre/media',
#'/var/www/alexandre.delanoe.org/',
)
TEMPLATE_CONTEXT_PROCESSORS = ( TEMPLATE_CONTEXT_PROCESSORS = (
"django.contrib.auth.context_processors.auth", "django.contrib.auth.context_processors.auth",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment