Commit 8b6693d0 authored by delanoe's avatar delanoe

Merge remote-tracking branch 'origin/refactoring-dev' into refactoring-merge

parents 4ad658c6 e6078955
......@@ -102,7 +102,7 @@ INDEXED_HYPERDATA = {
}
from gargantext.util.taggers import EnglishMeltTagger, FrenchMeltTagger, TurboTagger
from gargantext.util.taggers import FrenchMeltTagger, TurboTagger
LANGUAGES = {
'en': {
......
......@@ -26,7 +26,7 @@ SECRET_KEY = '!%ktkh981)piil1%t5r0g4$^0=uvdafk!=f2x8djxy7_gq(n5%'
DEBUG = True
MAINTENANCE = False
ALLOWED_HOSTS = ['localhost']
ALLOWED_HOSTS = ['localhost','dev.gargantext.org', 'garg-dev.iscpif.fr']
# Asynchronous tasks
......@@ -87,9 +87,21 @@ TEMPLATES = [
WSGI_APPLICATION = 'gargantext.wsgi.application'
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_ROOT = '/srv/gargantext_static/'
STATIC_URL = '/static/'
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'static'),
)
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
)
MEDIA_ROOT = '/srv/gargantext_media'
#MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
MEDIA_URL = '/media/'
......@@ -143,17 +155,4 @@ USE_L10N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/
#STATIC_URL = '/static/'
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'static'),
)
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
)
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