strichliste: fix config keys, fix config reload, optimize autoloader (#527170)

This commit is contained in:
Martin Weinelt
2026-06-16 21:37:59 +00:00
committed by GitHub
2 changed files with 33 additions and 27 deletions
+28 -26
View File
@@ -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;
@@ -476,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"
];
};
};
@@ -497,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 = {
+5 -1
View File
@@ -21,13 +21,17 @@ php.buildComposerProject2 (finalAttrs: {
vendorHash = "sha256-PLq+XiZIJyyzVq+87timGO/jbPB4ZYQqSZilZMIE4Cw=";
composerNoDev = true;
composerNoPlugins = false;
composerStrictValidation = false;
composerStrictValidation = true;
postPatch = ''
substituteInPlace config/services.yaml \
--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