diff --git a/REUSE.toml b/REUSE.toml index 256b7806..142ad9f4 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -20,7 +20,7 @@ precedence = "closest" [[annotations]] SPDX-FileCopyrightText = "2024 Tom Hubrecht " SPDX-License-Identifier = "EUPL-1.2" -path = ["machines/nixos/compute01/ds-fr/01-smtp-tls.patch", "machines/nixos/compute01/librenms/kanidm.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/nixpkgs/01-pretalx-environment-file.patch", "patches/nixpkgs/03-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch"] +path = ["machines/nixos/compute01/ds-fr/01-smtp-tls.patch", "machines/nixos/compute01/librenms/kanidm.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/nixpkgs/01-pretalx-environment-file.patch", "patches/nixpkgs/03-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch"] precedence = "closest" [[annotations]] diff --git a/default.nix b/default.nix index 10a951e0..8ac629ea 100644 --- a/default.nix +++ b/default.nix @@ -96,6 +96,7 @@ let "machines/nixos/compute01/librenms/kanidm.patch" "machines/nixos/compute01/stirling-pdf/*.patch" "machines/nixos/vault01/k-radius/packages/01-python_path.patch" + "machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch" "machines/nixos/web01/crabfit/*.patch" "machines/nixos/web02/cas-eleves/01-pytest-cas.patch" "patches/lix/01-disable-installChecks.patch" diff --git a/machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch b/machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch new file mode 100644 index 00000000..b542afb0 --- /dev/null +++ b/machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch @@ -0,0 +1,16 @@ +diff --git a/kanidm/radius/utils.py b/kanidm/radius/utils.py +index cbd3fe1f0..41fbd05c4 100644 +--- a/kanidm/radius/utils.py ++++ b/kanidm/radius/utils.py +@@ -25,11 +25,6 @@ def check_vlan( + raise ValueError("Need to pass this a kanidm_client") + + for radius_group in kanidm_client.config.radius_groups: +- logging.debug( +- "Checking vlan group '%s' against user group %s", +- radius_group.spn, +- group.spn, +- ) + if radius_group.spn == group.spn: + logging.info("returning new vlan: %s", radius_group.vlan) + return radius_group.vlan diff --git a/machines/nixos/vault01/k-radius/packages/pykanidm.nix b/machines/nixos/vault01/k-radius/packages/pykanidm.nix index 97877aac..b5c0ebcf 100644 --- a/machines/nixos/vault01/k-radius/packages/pykanidm.nix +++ b/machines/nixos/vault01/k-radius/packages/pykanidm.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-NH9V5KKI9LAtJ2/WuWtUJUzkjVMfO7Q5NQkK7Ys2olU="; }; + patches = [ + ./02-remove-noisy-logs.patch + ]; + sourceRoot = "source/pykanidm"; build-system = [ poetry-core ];