From 1f6baf0b528f48aff9379e7c441685cede5e4ca9 Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Wed, 6 Jun 2018 16:45:50 +0200 Subject: [PATCH] dont' import everything from global_settings (#24081) --- src/authentic2/settings.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/authentic2/settings.py b/src/authentic2/settings.py index 2b935d1c..b34a9c37 100644 --- a/src/authentic2/settings.py +++ b/src/authentic2/settings.py @@ -1,7 +1,7 @@ import logging import logging.config # Load default from Django -from django.conf.global_settings import * +from django.conf import global_settings import os import django @@ -9,6 +9,9 @@ import django from gadjo.templatetags.gadjo import xstatic from . import plugins, logger +# debian/debian_config.py::extract_settings_from_environ expects CACHES to be in its NAMESPACE +CACHES = global_settings.CACHES + BASE_DIR = os.path.dirname(__file__) ### Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/ @@ -90,7 +93,7 @@ TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'templates'),) STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),) -STATICFILES_FINDERS = STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',) +STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',) LOCALE_PATHS = ( os.path.join(BASE_DIR, 'locale'), ) @@ -178,7 +181,7 @@ IDP_BACKENDS = plugins.register_plugins_idp_backends(()) # Only https URLS are accepted. # Can be none, sp, idp or both -PASSWORD_HASHERS += ( +PASSWORD_HASHERS = global_settings.PASSWORD_HASHERS + ( 'authentic2.hashers.Drupal7PasswordHasher', 'authentic2.hashers.SHA256PasswordHasher', 'authentic2.hashers.SSHA1PasswordHasher', -- 2.17.0