From d522460c08f698bb795ace5b208409839bc2a529 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Mon, 1 Aug 2022 17:36:05 -0400
Subject: [PATCH] phpipam: merge cron tasks

---
 modules/phpipam.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/modules/phpipam.nix b/modules/phpipam.nix
index 85b04ed..eddab18 100644
--- a/modules/phpipam.nix
+++ b/modules/phpipam.nix
@@ -25,12 +25,6 @@ let
     '';
   };
 
-  cronScripts = {
-    phpipam_ping = "exec ${pkgs.php74}/bin/php ${phpipamHtdocs}/functions/scripts/pingCheck.php";
-    phpipam_remove_offline = "exec ${pkgs.php74}/bin/php ${phpipamHtdocs}/functions/scripts/remove_offline_addresses.php";
-    phpipam_discovery = "exec ${pkgs.php74}/bin/php ${phpipamHtdocs}/functions/scripts/discoveryCheck.php";
-  };
-
 in
 {
   options.sconfig.phpipam = {
@@ -62,17 +56,18 @@ in
       then { text = ""; }
       else { source = cfg.configFile; };
 
-    systemd.services = builtins.mapAttrs
-      (_: script: {
-        inherit script;
+    systemd = {
+      services.phpipam-tasks = {
+        script = ''
+          ${pkgs.php74}/bin/php ${phpipamHtdocs}/functions/scripts/pingCheck.php
+          ${pkgs.php74}/bin/php ${phpipamHtdocs}/functions/scripts/discoveryCheck.php
+          ${pkgs.php74}/bin/php ${phpipamHtdocs}/functions/scripts/remove_offline_addresses.php
+        '';
         serviceConfig.User = "nginx";
         startAt = "*:0/15";
-      })
-      cronScripts;
-
-    systemd.timers = builtins.mapAttrs
-      (_: _: { timerConfig.RandomizedDelaySec = 600; })
-      cronScripts;
+      };
+      timers.phpipam-tasks.timerConfig.RandomizedDelaySec = 600;
+    };
 
     services = {
       phpfpm.phpPackage = pkgs.php74;