movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

kanidm: allow hydra to cache alternative build with secret provisioning (#358782)

Browse source
This commit is contained in:
Ilan Joselevich 2024-11-28 19:35:25 +02:00 • committed by GitHub
commit c7c136a610
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/security/kanidm.nix
View file

@ -734,7 +734,7 @@ in
-> cfg.package.enableSecretProvisioning; -> cfg.package.enableSecretProvisioning;
message = '' message = ''
Specifying an admin account password or oauth2 basicSecretFile requires kanidm to be built with the secret provisioning patches. Specifying an admin account password or oauth2 basicSecretFile requires kanidm to be built with the secret provisioning patches.
You may want to set `services.kanidm.package = pkgs.kanidm.withSecretProvisioning;`. You may want to set `services.kanidm.package = pkgs.kanidmWithSecretProvisioning;`.
''; '';
} }
# Entity names must be globally unique: # Entity names must be globally unique:

2
nixos/tests/kanidm-provisioning.nix
View file

@ -23,7 +23,7 @@ import ./make-test-python.nix (
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
services.kanidm = { services.kanidm = {
package = pkgs.kanidm.withSecretProvisioning; package = pkgs.kanidmWithSecretProvisioning;
enableServer = true; enableServer = true;
serverSettings = { serverSettings = {
origin = "https://${serverDomain}"; origin = "https://${serverDomain}";

4
pkgs/top-level/all-packages.nix
View file

@ -11731,6 +11731,10 @@ with pkgs;
jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; jitsi-videobridge = callPackage ../servers/jitsi-videobridge { };
kanidmWithSecretProvisioning = callPackage ../by-name/ka/kanidm/package.nix {
enableSecretProvisioning = true;
};
knot-resolver = callPackage ../servers/dns/knot-resolver { knot-resolver = callPackage ../servers/dns/knot-resolver {
systemd = systemdMinimal; # in closure already anyway systemd = systemdMinimal; # in closure already anyway
}; };