Platform 23.11 #96

Merged
max merged 47 commits from platform-23.11 into master 2023-12-05 01:59:28 +02:00
4 changed files with 0 additions and 23 deletions
Showing only changes of commit b0e81bf75a - Show all commits

View file

@ -7,7 +7,6 @@
inherit (patched) inherit (patched)
kanidm kanidm
powerdns-admin
prometheus-jitsi-exporter prometheus-jitsi-exporter
tempo tempo
; ;

View file

@ -44,14 +44,6 @@ super: rec {
postgresql = super.postgresql_14; postgresql = super.postgresql_14;
powerdns-admin = let
package = super.powerdns-admin.override {
python3 = super.python3.override {
packageOverrides = _: _: { python3-saml = null; };
};
};
in patch package "patches/base/powerdns-admin";
prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter"; prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter";
s3ql = (patch super.s3ql "patches/base/s3ql").overrideAttrs (old: { s3ql = (patch super.s3ql "patches/base/s3ql").overrideAttrs (old: {

View file

@ -5,7 +5,6 @@
hydra = [ "x86_64-linux" ]; hydra = [ "x86_64-linux" ];
jellyfin = [ "x86_64-linux" ]; jellyfin = [ "x86_64-linux" ];
keycloak = [ "x86_64-linux" ]; keycloak = [ "x86_64-linux" ];
powerdns-admin = [ "x86_64-linux" ];
prometheus-jitsi-exporter = [ "aarch64-linux" ]; prometheus-jitsi-exporter = [ "aarch64-linux" ];
searxng = [ "x86_64-linux" ]; searxng = [ "x86_64-linux" ];
tempo = [ "x86_64-linux" ]; tempo = [ "x86_64-linux" ];

View file

@ -1,13 +0,0 @@
diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py
index 3a6f55c..417e05f 100644
--- a/powerdnsadmin/routes/index.py
+++ b/powerdnsadmin/routes/index.py
@@ -392,7 +392,7 @@ def login():
return authenticate_user(user, 'Azure OAuth')
if 'oidc_token' in session:
- user_data = json.loads(oidc.get('userinfo').text)
+ user_data = oidc.userinfo()
oidc_username = user_data[Setting().get('oidc_oauth_username')]
oidc_first_name = user_data[Setting().get('oidc_oauth_firstname')]
oidc_last_name = user_data[Setting().get('oidc_oauth_last_name')]