external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-14 12:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add middleware and rearrange to make pylint happier

Browse Source
This commit is contained in:
Oliver Falk
2018-11-19 15:43:46 +01:00
parent 8f466b3682
commit 2f79608a59
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config.py
View File

@@ -4,14 +4,16 @@ Configuration overrides for settings.py
import os import os
import sys import sys
from socket import gethostname, gethostbyname
from django.urls import reverse_lazy from django.urls import reverse_lazy
from ivatar.settings import BASE_DIR from ivatar.settings import BASE_DIR
from ivatar.settings import MIDDLEWARE
from ivatar.settings import INSTALLED_APPS
from ivatar.settings import TEMPLATES
ADMIN_USERS = [] ADMIN_USERS = []
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
from ivatar.settings import INSTALLED_APPS # noqa
INSTALLED_APPS.extend([ INSTALLED_APPS.extend([
'django_extensions', 'django_extensions',
'django_openid_auth', 'django_openid_auth',
@@ -22,10 +24,12 @@ INSTALLED_APPS.extend([
'ivatar.tools', 'ivatar.tools',
]) ])
from ivatar.settings import MIDDLEWARE # noqa
MIDDLEWARE.extend([ MIDDLEWARE.extend([
'django.middleware.locale.LocaleMiddleware', 'django.middleware.locale.LocaleMiddleware',
]) ])
MIDDLEWARE.insert(
0, 'ivatar.middleware.MultipleProxyMiddleware',
)
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
# Enable this to allow LDAP authentication. # Enable this to allow LDAP authentication.
@@ -35,7 +39,6 @@ AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',
) )
from ivatar.settings import TEMPLATES # noqa
TEMPLATES[0]['DIRS'].extend([ TEMPLATES[0]['DIRS'].extend([
os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'templates'),
]) ])
@@ -76,7 +79,8 @@ BOOTSTRAP4 = {
'javascript_in_head': False, 'javascript_in_head': False,
'css_url': { 'css_url': {
'href': '/static/css/bootstrap.min.css', 'href': '/static/css/bootstrap.min.css',
'integrity': 'sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB', # noqa 'integrity':
'sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB',
'crossorigin': 'anonymous', 'crossorigin': 'anonymous',
}, },
'javascript_url': { 'javascript_url': {
@@ -86,7 +90,8 @@ BOOTSTRAP4 = {
}, },
'popper_url': { 'popper_url': {
'url': '/static/js/popper.min.js', 'url': '/static/js/popper.min.js',
'integrity': 'sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49', # noqa 'integrity':
'sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49',
'crossorigin': 'anonymous', 'crossorigin': 'anonymous',
}, },
} }
@@ -134,3 +139,4 @@ if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')):
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
USE_X_FORWARDED_HOST = True USE_X_FORWARDED_HOST = True
ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = ['avatars.linux-kernel.at', 'localhost',]