From a2b2a38fe745fb41e63f2b17181e8b7fd8e779b7 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Wed, 3 Jul 2024 15:08:54 +0200 Subject: [PATCH] feat(settings): Allow a simpler overriding of the ldap URI --- .credentials/LDAP_URI | 1 + app/settings.py | 2 +- nix/loadcredential/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .credentials/LDAP_URI diff --git a/.credentials/LDAP_URI b/.credentials/LDAP_URI new file mode 100644 index 0000000..d8186ed --- /dev/null +++ b/.credentials/LDAP_URI @@ -0,0 +1 @@ +ldaps://ldap.spi.ens.fr:6636 diff --git a/app/settings.py b/app/settings.py index e3052e3..e5b5c72 100644 --- a/app/settings.py +++ b/app/settings.py @@ -169,7 +169,7 @@ LOGGING = { CAS_AUTH_CLASS = "cas_server.auth.LdapAuthUser" CAS_LDAP_SERVER = ldap3.Server( - "ldaps://ldap.spi.ens.fr:636", + credentials.get("LDAP_URI", "ldaps://ldap.spi.ens.fr:636"), get_info=ldap3.ALL, tls=ldap3.Tls( validate=ssl.CERT_REQUIRED, diff --git a/nix/loadcredential/default.nix b/nix/loadcredential/default.nix index 899fbed..e05efaf 100644 --- a/nix/loadcredential/default.nix +++ b/nix/loadcredential/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "loadcredential"; - version = "1.1"; + version = "1.2"; pyproject = true; src = fetchFromGitHub { owner = "Tom-Hubrecht"; repo = "loadcredential"; rev = "v${version}"; - hash = "sha256-GXpMqGLDmDnTGa9cBYe0CP3Evm5sQ3AK9u6k3mLAW34="; + hash = "sha256-rNWFD89h1p1jYWLcfzsa/w8nK3bR4aVJsUPx0UtZnIw="; }; build-system = [