feat(compute01): Update nixos, but keep kanidm_1_3
This commit is contained in:
parent
659ddf39e5
commit
12f19506fc
4 changed files with 9 additions and 4 deletions
|
@ -5,6 +5,7 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
|
pkgs,
|
||||||
meta,
|
meta,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
@ -43,10 +44,12 @@ let
|
||||||
usernameFor = member: meta.organization.members.${member}.username;
|
usernameFor = member: meta.organization.members.${member}.username;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [ "kanidm-1.3.3" ];
|
||||||
|
|
||||||
services.kanidm = {
|
services.kanidm = {
|
||||||
enableServer = true;
|
enableServer = true;
|
||||||
|
|
||||||
# package = nixpkgs.unstable.kanidm;
|
package = pkgs.kanidm_1_3;
|
||||||
|
|
||||||
serverSettings = {
|
serverSettings = {
|
||||||
inherit domain;
|
inherit domain;
|
||||||
|
|
|
@ -19,6 +19,8 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
disabledModules = [ "services/web-apps/stirling-pdf.nix" ];
|
||||||
|
|
||||||
dgn-web.internalPorts.stirling-pdf = port;
|
dgn-web.internalPorts.stirling-pdf = port;
|
||||||
|
|
||||||
services.stirling-pdf = {
|
services.stirling-pdf = {
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
nix-modules = [ "services/stirling-pdf" ];
|
nix-modules = [ "services/stirling-pdf" ];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
version = "24.05";
|
version = "24.11";
|
||||||
system = "nixos";
|
system = "nixos";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -289,8 +289,8 @@
|
||||||
"nixos-24.11": {
|
"nixos-24.11": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixos-24.11",
|
"name": "nixos-24.11",
|
||||||
"url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.710486.4dc2fc4e62db/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.711150.314e12ba369c/nixexprs.tar.xz",
|
||||||
"hash": "1pby8y3dcbdcjb6dklyy0wnn1dhzbbqaki6l2nlw9x13n6qqj4mb"
|
"hash": "15vk061qfvpbc41kwbh5ssrlfw0rlcswc7ljjgyb26nrhhw56qph"
|
||||||
},
|
},
|
||||||
"nixos-generators": {
|
"nixos-generators": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
|
Loading…
Reference in a new issue