From 15b4b8f7ef2232d5425def56b63565fa69720997 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 10 Feb 2023 22:13:03 -0500 Subject: [PATCH] phpipam tweaks use php7 by default (until phpipam supports 8) fix timezone remove max execution time add RandomizedDelaySec to timer --- modules/phpipam.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/phpipam.nix b/modules/phpipam.nix index 27753a9..4d2c060 100644 --- a/modules/phpipam.nix +++ b/modules/phpipam.nix @@ -49,7 +49,9 @@ in phpPackage = lib.mkOption { 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"; }; timers.phpipam-tasks = { - timerConfig.OnBootSec = 900; - timerConfig.OnUnitInactiveSec = 900; + timerConfig.OnBootSec = 600; + timerConfig.OnUnitInactiveSec = 600; + timerConfig.RandomizedDelaySec = 300; wantedBy = [ "timers.target" ]; }; }; @@ -83,10 +86,6 @@ in user = "nginx"; group = "nginx"; phpEnv.PHP_INI_SCAN_DIR = "$PHP_INI_SCAN_DIR"; - phpOptions = '' - date.timezone = America/New_York - max_execution_time = 600 - ''; settings = { "pm" = "ondemand"; "pm.max_children" = "8";