From 67623898740162b5b8ea830a1b2776762d64a34a Mon Sep 17 00:00:00 2001 From: Micha Ober Date: Tue, 16 Jun 2026 22:02:19 +0200 Subject: [PATCH 1/4] nixos/strichliste: fix typos in config keys --- .../modules/services/web-apps/strichliste.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix index e32a2a169169..44d0754460cc 100644 --- a/nixos/modules/services/web-apps/strichliste.nix +++ b/nixos/modules/services/web-apps/strichliste.nix @@ -128,21 +128,23 @@ in }; account = { - lower = mkOption { - type = types.int; - default = -200000; - example = 0; - description = '' - The credit limit for user accounts. - ''; - }; + boundary = { + lower = mkOption { + type = types.int; + default = -200000; + example = 0; + description = '' + The credit limit for user accounts. + ''; + }; - upper = mkOption { - type = types.ints.positive; - default = 200000; - description = '' - The maximum balance on a user account. - ''; + upper = mkOption { + type = types.ints.positive; + default = 200000; + description = '' + The maximum balance on a user account. + ''; + }; }; }; @@ -256,7 +258,7 @@ in }; }; - transaction = { + transactions = { enabled = mkOption { type = types.bool; default = true; From 2fec1f1b4d3094afc0b0a221d54abc4e91f920e8 Mon Sep 17 00:00:00 2001 From: Micha Ober Date: Tue, 16 Jun 2026 22:02:46 +0200 Subject: [PATCH 2/4] strichliste: enable strict validation of composer.json --- pkgs/by-name/st/strichliste/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix index f81fceed7452..ca9221531e91 100644 --- a/pkgs/by-name/st/strichliste/package.nix +++ b/pkgs/by-name/st/strichliste/package.nix @@ -21,7 +21,7 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-PLq+XiZIJyyzVq+87timGO/jbPB4ZYQqSZilZMIE4Cw="; composerNoDev = true; composerNoPlugins = false; - composerStrictValidation = false; + composerStrictValidation = true; postPatch = '' substituteInPlace config/services.yaml \ From 6cec788e01436ad90abc2871dfc3d83d4db9e0bb Mon Sep 17 00:00:00 2001 From: Micha Ober Date: Tue, 16 Jun 2026 22:03:07 +0200 Subject: [PATCH 3/4] strichliste: use optimized autoloader --- pkgs/by-name/st/strichliste/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix index ca9221531e91..03ce5c895245 100644 --- a/pkgs/by-name/st/strichliste/package.nix +++ b/pkgs/by-name/st/strichliste/package.nix @@ -28,6 +28,10 @@ php.buildComposerProject2 (finalAttrs: { --replace-fail "strichliste.yaml" "/etc/strichliste.yaml" ''; + postBuild = '' + composer dump-autoload --optimize --no-dev --no-scripts --no-interaction --no-cache + ''; + postInstall = '' mkdir $out/bin ln -s $out/share/php/strichliste-backend/bin/console $out/bin/strichliste-console From a17b5e97d4eb7f591ceeb3200221adc18cb36b85 Mon Sep 17 00:00:00 2001 From: Micha Ober Date: Tue, 16 Jun 2026 22:04:17 +0200 Subject: [PATCH 4/4] nixos/strichliste: fix stale cache on config change --- .../modules/services/web-apps/strichliste.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix index 44d0754460cc..8aa78f62bcd0 100644 --- a/nixos/modules/services/web-apps/strichliste.nix +++ b/nixos/modules/services/web-apps/strichliste.nix @@ -478,20 +478,15 @@ in inherit (cfg) environment; serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; User = "strichliste"; Group = "strichliste"; EnvironmentFile = cfg.environmentFiles; - ExecStart = map toString [ - [ - (lib.getExe cfg.packages.backend) - "cache:clear" - ] - [ - (lib.getExe cfg.packages.backend) - "doctrine:migrations:migrate" - "--allow-no-migration" - "--no-interaction" - ] + ExecStart = toString [ + (lib.getExe cfg.packages.backend) + "doctrine:migrations:migrate" + "--allow-no-migration" + "--no-interaction" ]; }; }; @@ -499,6 +494,11 @@ in systemd.services.phpfpm-strichliste = { inherit (cfg) environment; serviceConfig.EnvironmentFile = cfg.environmentFiles; + restartTriggers = [ settingsFile ]; + preStart = toString [ + (lib.getExe cfg.packages.backend) + "cache:clear" + ]; }; services.phpfpm.pools.strichliste = {