From e3abb23e98f713100bd309e507dd355bfc4ef533 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Fri, 26 Jul 2024 11:04:39 +0200 Subject: [PATCH] challenger/nextcloud: Try bothering nextcloud into giving me exiftool --- hosts/challenger/services/nextcloud.nix | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hosts/challenger/services/nextcloud.nix b/hosts/challenger/services/nextcloud.nix index a7bc0dd..fac6f08 100644 --- a/hosts/challenger/services/nextcloud.nix +++ b/hosts/challenger/services/nextcloud.nix @@ -46,15 +46,11 @@ in { oidc_login_filter_allowed_values = [ "nextcloud-user" ]; oidc_login_disable_registration = false; - memories = { - # exiftool = "${lib.getExe pkgs.exiftool}"; # TODO - not working, use perl - # exiftool_no_local = false; - vod = { - disable = false; - ffmpeg = "${lib.getExe pkgs.ffmpeg-headless}"; - ffprobe = "${pkgs.ffmpeg-headless}/bin/ffprobe"; - }; - }; + "memories.exiftool" = "${cfg.home}/store-apps/memories/bin-ext/exiftool-amd64-glibc"; + "memories.exiftool_no_local" = false; + "memories.vod.disable" = false; + "memories.vod.ffmpeg" = "${lib.getExe pkgs.ffmpeg-headless}"; + "memories.vod.ffprobe" = "${pkgs.ffmpeg-headless}/bin/ffprobe"; preview_ffmpeg_path = "${pkgs.ffmpeg-headless}/bin/ffmpeg"; }; @@ -102,7 +98,10 @@ in { }; systemd.services.nextcloud-cron = { - path = [ pkgs.perl ]; # exiftool doesn't work, so make perl available instead + path = with pkgs; [ + exiftool + ffmpeg-headless + ]; }; systemd.services."nextcloud-setup" = { @@ -112,7 +111,12 @@ in { systemd.services."phpfpm-nextcloud" = { requires = [ "tank-nextcloud.mount" ]; - path = [ pkgs.perl ]; + path = with pkgs; [ + # perl + # perlPackages.ImageExifTool + exiftool + ffmpeg-headless + ]; serviceConfig = { PrivateDevices = lib.mkForce false; WorkingDirectory = "/tank/nextcloud";