trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some settings not being overwritten

This commit is contained in:
Jens Langhammer 2018-11-24 22:27:02 +01:00
parent cb46c70670
commit 28557806c5
No known key found for this signature in database
GPG Key ID: BEBC05297D92821B
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
passbook/core/settings.py
View File

@ -32,7 +32,7 @@ SECRET_KEY = '9$@r!d^1^jrn#fk#1#@ks#9&i$^s#1)_13%$rwjrhd=e8jfi_s'
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
INTERNAL_IPS = ['127.0.0.1'] INTERNAL_IPS = ['127.0.0.1']
ALLOWED_HOSTS = [] ALLOWED_HOSTS = ['172.16.16.100']
LOGIN_URL = 'passbook_core:auth-login' LOGIN_URL = 'passbook_core:auth-login'
@ -56,7 +56,6 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'reversion', 'reversion',
'rest_framework', 'rest_framework',
'crispy_forms',
'passbook.core', 'passbook.core',
'passbook.admin', 'passbook.admin',
'passbook.api', 'passbook.api',
@ -67,6 +66,9 @@ INSTALLED_APPS = [
'passbook.oauth_provider', 'passbook.oauth_provider',
'passbook.saml_idp', 'passbook.saml_idp',
'passbook.tfa', 'passbook.tfa',
'crispy_forms',
'oauth2_provider',
'corsheaders',
] ]
# Message Tag fix for bootstrap CSS Classes # Message Tag fix for bootstrap CSS Classes
@ -257,11 +259,7 @@ with CONFIG.cd('log'):
} }
} }
if DEBUG: _DISALLOWED_ITEMS = ['INSTALLED_APPS', 'MIDDLEWARE', 'AUTHENTICATION_BACKENDS']
INSTALLED_APPS.append('debug_toolbar')
MIDDLEWARE.append('debug_toolbar.middleware.DebugToolbarMiddleware')
# Load subapps's INSTALLED_APPS # Load subapps's INSTALLED_APPS
for _app in INSTALLED_APPS: for _app in INSTALLED_APPS:
if _app.startswith('passbook') and \ if _app.startswith('passbook') and \
@ -273,5 +271,12 @@ for _app in INSTALLED_APPS:
INSTALLED_APPS.extend(getattr(app_settings, 'INSTALLED_APPS', [])) INSTALLED_APPS.extend(getattr(app_settings, 'INSTALLED_APPS', []))
MIDDLEWARE.extend(getattr(app_settings, 'MIDDLEWARE', [])) MIDDLEWARE.extend(getattr(app_settings, 'MIDDLEWARE', []))
AUTHENTICATION_BACKENDS.extend(getattr(app_settings, 'AUTHENTICATION_BACKENDS', [])) AUTHENTICATION_BACKENDS.extend(getattr(app_settings, 'AUTHENTICATION_BACKENDS', []))
for _attr in dir(app_settings):
if not _attr.startswith('__') and _attr not in _DISALLOWED_ITEMS:
globals()[_attr] = getattr(app_settings, _attr)
except ImportError: except ImportError:
pass pass
if DEBUG:
INSTALLED_APPS.append('debug_toolbar')
MIDDLEWARE.append('debug_toolbar.middleware.DebugToolbarMiddleware')

2
passbook/core/templates/base/skeleton.html
View File

@ -14,7 +14,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/patternfly.min.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'css/patternfly.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/patternfly-additions.min.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'css/patternfly-additions.min.css' %}">
</head> </head>
<body {% if is_login %} class="login-pf" {% endif %}> <body {% if is_login or client_id %} class="login-pf" {% endif %}>
{% block body %} {% block body %}
{% endblock %} {% endblock %}
<script src="{% static 'js/jquery.min.js' %}"></script> <script src="{% static 'js/jquery.min.js' %}"></script>