phpipam tweaks

use php7 by default (until phpipam supports 8)
fix timezone
remove max execution time
add RandomizedDelaySec to timer
This commit is contained in:
Sean Buckley 2023-02-10 22:13:03 -05:00
parent 5b2d1a0abe
commit 15b4b8f7ef

View file

@ -49,7 +49,9 @@ in
phpPackage = lib.mkOption { phpPackage = lib.mkOption {
type = lib.types.package; type = lib.types.package;
default = pkgs.php; default = pkgs.php74.buildEnv {
extraConfig = "date.timezone=${config.time.timeZone}";
};
}; };
}; };
@ -71,8 +73,9 @@ in
serviceConfig.User = "nginx"; serviceConfig.User = "nginx";
}; };
timers.phpipam-tasks = { timers.phpipam-tasks = {
timerConfig.OnBootSec = 900; timerConfig.OnBootSec = 600;
timerConfig.OnUnitInactiveSec = 900; timerConfig.OnUnitInactiveSec = 600;
timerConfig.RandomizedDelaySec = 300;
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
}; };
}; };
@ -83,10 +86,6 @@ in
user = "nginx"; user = "nginx";
group = "nginx"; group = "nginx";
phpEnv.PHP_INI_SCAN_DIR = "$PHP_INI_SCAN_DIR"; phpEnv.PHP_INI_SCAN_DIR = "$PHP_INI_SCAN_DIR";
phpOptions = ''
date.timezone = America/New_York
max_execution_time = 600
'';
settings = { settings = {
"pm" = "ondemand"; "pm" = "ondemand";
"pm.max_children" = "8"; "pm.max_children" = "8";