Commit 673a4a2a authored by sim's avatar sim

[REFACT] Little cleanup

parent 83d6135b
...@@ -41,14 +41,10 @@ CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml'] ...@@ -41,14 +41,10 @@ CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
CELERY_TIMEZONE = 'Europe/Paris' CELERY_TIMEZONE = 'Europe/Paris'
CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler' CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
CELERY_IMPORTS = ( CELERY_IMPORTS = (
"gargantext.util.toolchain", "gargantext.util.toolchain",
"gargantext.util.crawlers", "gargantext.util.crawlers",
"gargantext.util.ngramlists_tools", "gargantext.util.ngramlists_tools",
) )
# garg's custom unittests runner (adapted to our db models)
TEST_RUNNER = 'unittests.framework.GargTestRunner'
# Application definition # Application definition
...@@ -80,10 +76,7 @@ ROOT_URLCONF = 'gargantext.urls' ...@@ -80,10 +76,7 @@ ROOT_URLCONF = 'gargantext.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [ 'DIRS': [],
os.path.join(BASE_DIR, 'templates'),
#'./templates'
],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
...@@ -119,7 +112,6 @@ JWT_AUTH = { ...@@ -119,7 +112,6 @@ JWT_AUTH = {
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/ # https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_ROOT = '/srv/gargantext_static/'
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATICFILES_DIRS = ( STATICFILES_DIRS = (
...@@ -131,8 +123,7 @@ STATICFILES_FINDERS = ( ...@@ -131,8 +123,7 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
) )
MEDIA_ROOT = '/srv/gargantext_media' MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
#MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
......
"""URL Configuration of GarganText """URL Configuration of GarganText"""
Views are shared between these modules: from django.conf.urls import url
- `contents`, for Python-generated contents
"""
from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.views.generic.base import RedirectView as Redirect from django.views.generic.base import RedirectView as Redirect
from django.contrib.staticfiles.storage import staticfiles_storage as static from django.contrib.staticfiles.storage import staticfiles_storage as static
urlpatterns = [ url(r'^admin/' , admin.site.urls ) urlpatterns = [
, url(r'^favicon.ico$', Redirect.as_view( url=static.url('favicon.ico') url(r'^admin/', admin.site.urls),
, permanent=False), name="favicon" ) url(r'^favicon.ico$', Redirect.as_view(url=static.url('favicon.ico'),
] permanent=False), name="favicon"),
]
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