Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
673a4a2a
Commit
673a4a2a
authored
Oct 31, 2017
by
sim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[REFACT] Little cleanup
parent
83d6135b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
25 deletions
+13
-25
settings.py
gargantext/settings.py
+6
-15
urls.py
gargantext/urls.py
+7
-10
No files found.
gargantext/settings.py
View file @
673a4a2a
...
@@ -44,11 +44,7 @@ CELERY_IMPORTS = (
...
@@ -44,11 +44,7 @@ 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/'
...
...
gargantext/urls.py
View file @
673a4a2a
"""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"
),
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment