Clean django settings

gargantext/settings.py

@@ -26,26 +26,9 @@ SECRET_KEY = '!%ktkh981)piil1%t5r0g4$^0=uvdafk!=f2x8djxy7_gq(n5%'
 DEBUG = True
 MAINTENANCE = False
 
-BASE_URL = "testing.gargantext.org"
-ALLOWED_HOSTS = ["localhost", ".gargantext.org", ".iscpif.fr",]
+ALLOWED_HOSTS = []
 
 
-# Asynchronous tasks
-
-import djcelery
-djcelery.setup_loader()
-
-BROKER_URL = 'amqp://guest:guest@localhost:5672/'
-
-CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
-CELERY_TIMEZONE = 'Europe/Paris'
-CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
-CELERY_IMPORTS = (
-    "gargantext.util.toolchain",
-    "gargantext.util.crawlers",
-    "gargantext.util.ngramlists_tools",
-)
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -91,42 +74,6 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'gargantext.wsgi.application'
 
-# http://getblimp.github.io/django-rest-framework-jwt/#additional-settings
-REST_FRAMEWORK = {
-    'DEFAULT_PERMISSION_CLASSES': (
-        'rest_framework.permissions.IsAuthenticated',
-    ),
-    'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
-        'rest_framework.authentication.SessionAuthentication',
-        'rest_framework.authentication.BasicAuthentication',
-    ),
-}
-
-JWT_AUTH = {
-    'JWT_VERIFY_EXPIRATION': False,
-    'JWT_SECRET_KEY': SECRET_KEY,
-    'JWT_AUTH_HEADER_PREFIX': 'Bearer',
-}
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.9/howto/static-files/
-
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-STATIC_URL = '/static/'
-
-STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'gargantext/static'),
-)
-
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-)
-
-MEDIA_ROOT  = os.path.join(BASE_DIR, 'media')
-MEDIA_URL   = '/media/'
-
 # Database
 # https://docs.djangoproject.com/en/1.9/ref/settings/#databases
 
@@ -166,16 +113,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-API_TOKENS = {
-    "CERN": {
-        "APIKEY":'b8514451-82d1-408e-a855-56d342a0b5f8',
-        "APISECRET":'6680b13e-2b5a-4fba-8c0e-408884d5b904',
-    },
-    "MULTIVAC": {
-        "APIKEY": "3a8ca010-1dff-11e7-97ef-a1a6aa4c2352"
-    }
-}
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 
@@ -189,5 +126,72 @@ USE_L10N = True
 
 USE_TZ = True
 
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.11/howto/static-files/
+
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_URL = '/static/'
+
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'gargantext/static'),
+)
+
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+)
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_URL = '/media/'
+
+# Asynchronous tasks
+
+import djcelery
+djcelery.setup_loader()
+
+BROKER_URL = 'amqp://guest:guest@localhost:5672/'
+
+CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
+CELERY_TIMEZONE = 'Europe/Paris'
+CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
+CELERY_IMPORTS = (
+    "gargantext.util.toolchain",
+    "gargantext.util.crawlers",
+    "gargantext.util.ngramlists_tools",
+)
+
+# REST-API
+
+# See http://getblimp.github.io/django-rest-framework-jwt/#additional-settings
+REST_FRAMEWORK = {
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+    ),
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.BasicAuthentication',
+    ),
+}
+
+JWT_AUTH = {
+    'JWT_VERIFY_EXPIRATION': False,
+    'JWT_SECRET_KEY': SECRET_KEY,
+    'JWT_AUTH_HEADER_PREFIX': 'Bearer',
+}
+
+# Third-party web APIs
+
+API_TOKENS = {
+    "CERN": {
+        "APIKEY":'b8514451-82d1-408e-a855-56d342a0b5f8',
+        "APISECRET":'6680b13e-2b5a-4fba-8c0e-408884d5b904',
+    },
+    "MULTIVAC": {
+        "APIKEY": "3a8ca010-1dff-11e7-97ef-a1a6aa4c2352"
+    }
+}
+
 # BOOL Interpreter
+
 BOOL_TOOLS_PATH="/srv/gargantext/gargantext/util/crawlers/sparql"