Skip to content

Commit 1bbc43e

Browse files
committed
Experiment with some settings
No luck yet.
1 parent c2503e0 commit 1bbc43e

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

pulpcore/app/settings.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from django.core.exceptions import ImproperlyConfigured
2020
from dynaconf import DjangoDynaconf, Dynaconf, Validator
2121
from dynaconf.base import Settings
22-
from dynaconf.utils.functional import empty
2322

2423
from pulpcore import constants
2524

@@ -608,21 +607,22 @@ def otel_middleware_hook(settings):
608607

609608
def saml2_settings_hook(settings):
610609
data = {"dynaconf_merge": True}
611-
if "LOGIN_URL" not in settings:
612-
data["LOGIN_URL"] = "/saml2/login/"
613-
if "SESSION_COOKIE_SECURE" not in settings:
614-
data["SESSION_COOKIE_SECURE"] = True
615-
if "SESSION_EXPIRE_AT_BROWSER_CLOSE" not in settings:
616-
data["SESSION_EXPIRE_AT_BROWSER_CLOSE"] = True
617610
if "SAML_CONFIG" in settings:
618611
data["INSTALLED_APPS"] = ["djangosaml2"]
619612
data["MIDDLEWARE"] = ["djangosaml2.middleware.SamlSessionMiddleware"]
620613
data["AUTHENTICATION_BACKENDS"] = ["djangosaml2.backends.Saml2Backend"]
614+
if "LOGIN_URL" not in settings:
615+
data["LOGIN_URL"] = "/saml2/login/"
616+
if "SESSION_COOKIE_SECURE" not in settings:
617+
data["SESSION_COOKIE_SECURE"] = True
618+
if "SESSION_EXPIRE_AT_BROWSER_CLOSE" not in settings:
619+
data["SESSION_EXPIRE_AT_BROWSER_CLOSE"] = True
621620
return data
622621

623622

624623
del preload_settings
625624

625+
626626
class PulpSettings(Settings):
627627
def _ready(self):
628628
self._store = self._store.to_dict()

0 commit comments

Comments
 (0)