0001-dont-import-everything-from-global_settings-24081.patch
src/authentic2/settings.py | ||
---|---|---|
1 | 1 |
import logging |
2 | 2 |
import logging.config |
3 | 3 |
# Load default from Django |
4 |
from django.conf.global_settings import *
|
|
4 |
from django.conf import global_settings
|
|
5 | 5 |
import os |
6 | 6 | |
7 | 7 |
import django |
... | ... | |
9 | 9 |
from gadjo.templatetags.gadjo import xstatic |
10 | 10 |
from . import plugins, logger |
11 | 11 | |
12 |
# debian/debian_config.py::extract_settings_from_environ expects CACHES to be in its NAMESPACE |
|
13 |
CACHES = global_settings.CACHES |
|
14 | ||
12 | 15 |
BASE_DIR = os.path.dirname(__file__) |
13 | 16 |
### Quick-start development settings - unsuitable for production |
14 | 17 |
# See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/ |
... | ... | |
90 | 93 | |
91 | 94 |
STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),) |
92 | 95 | |
93 |
STATICFILES_FINDERS = STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',) |
|
96 |
STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',)
|
|
94 | 97 | |
95 | 98 |
LOCALE_PATHS = ( os.path.join(BASE_DIR, 'locale'), ) |
96 | 99 | |
... | ... | |
178 | 181 |
# Only https URLS are accepted. |
179 | 182 |
# Can be none, sp, idp or both |
180 | 183 | |
181 |
PASSWORD_HASHERS += (
|
|
184 |
PASSWORD_HASHERS = global_settings.PASSWORD_HASHERS + (
|
|
182 | 185 |
'authentic2.hashers.Drupal7PasswordHasher', |
183 | 186 |
'authentic2.hashers.SHA256PasswordHasher', |
184 | 187 |
'authentic2.hashers.SSHA1PasswordHasher', |
185 |
- |