From 425147aa3a8752c260da78e30db15b09311a6878 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Tue, 11 Jun 2024 21:34:57 -0400
Subject: [PATCH] finalize pre-generation service

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 systems/palatine-hill/cron/default.nix | 17 -----------------
 systems/palatine-hill/nextcloud.nix    | 13 +++++++++----
 2 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 systems/palatine-hill/cron/default.nix

diff --git a/systems/palatine-hill/cron/default.nix b/systems/palatine-hill/cron/default.nix
deleted file mode 100644
index d59dcbf..0000000
--- a/systems/palatine-hill/cron/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  services.cron.enable = true;
-  services.cron.cronFiles = [ /etc/rad-dev/nextcloud-cron ];
-  environment.etc.nextcloud-cron = {
-    text = ''
-      */10 * * * * docker ps --format "{{.Names}}" | grep -q "^nextcloud-nextcloud-1$" && docker exec --user www-data nextcloud-nextcloud-1 php occ preview:pre-generate
-    '';
-    target = "rad-dev/nextcloud-cron";
-  };
-}
diff --git a/systems/palatine-hill/nextcloud.nix b/systems/palatine-hill/nextcloud.nix
index 683b131..4fc826e 100644
--- a/systems/palatine-hill/nextcloud.nix
+++ b/systems/palatine-hill/nextcloud.nix
@@ -24,14 +24,19 @@
       "docker.service"
       "multi-user.target"
     ];
-    description = "incrementally pre-generates previews on nextcloud";
+    description = "incremental pre-generation of previews on nextcloud";
     serviceConfig = {
       Type = "oneshot";
       DynamicUser = "yes";
       Group = "docker";
-      ExecStart = ''
-        ${pkgs.docker}/bin/docker ps --format "{{.Names}}" | ${pkgs.gnugrep}/bin/grep -q "^nextcloud-nextcloud-1$" && ${pkgs.docker}/bin/docker exec --user www-data nextcloud-nextcloud-1 php occ preview:pre-generate
-      '';
+      ExecStart = [
+        ''
+          ${pkgs.bash}/bin/bash -c '${pkgs.docker}/bin/docker ps --format "{{.Names}}" | ${pkgs.gnugrep}/bin/grep -q "^nextcloud-nextcloud-1$"'
+        ''
+        ''
+          ${pkgs.docker}/bin/docker exec --user www-data nextcloud-nextcloud-1 php occ preview:pre-generate
+        ''
+      ];
     };
   };
 }