From 428fd47816673a6721870e127e1c4230fb7cf461 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 5 Oct 2025 15:35:58 +0900 Subject: [PATCH] nixos/paperless: replace systemd `script` with `ExecStart` --- nixos/modules/services/misc/paperless.nix | 9 +++------ nixos/tests/paperless.nix | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 14bb792790a7..04759856ac7a 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -664,6 +664,9 @@ in serviceConfig = { User = cfg.user; WorkingDirectory = cfg.dataDir; + ExecStart = "${manage}/bin/paperless-manage document_exporter ${cfg.exporter.directory} ${ + lib.cli.toCommandLineShellGNU { } cfg.exporter.settings + }"; }; unitConfig = let @@ -682,13 +685,7 @@ in OnFailure = services; OnSuccess = services; }; - enableStrictShellChecks = true; path = [ manage ]; - script = '' - paperless-manage document_exporter ${cfg.exporter.directory} ${ - lib.cli.toCommandLineShellGNU { } cfg.exporter.settings - } - ''; }; }) ] diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 3f215febda7c..64610e584e01 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -116,9 +116,9 @@ assert "1 timers listed." in timers, "incorrect number of timers" # Double check that our attrset option override works as expected - cmdline = node.succeed("grep 'paperless-manage' $(systemctl cat paperless-exporter | grep ExecStart | cut -f 2 -d=)") + cmdline = node.succeed("systemctl cat paperless-exporter | grep ExecStart | grep 'paperless-manage' | cut -f 2 -d=") print(f"Exporter command line {cmdline!r}") - assert cmdline.strip() == "paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail", "Unexpected exporter command line" + assert cmdline.strip().endswith("paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail"), "Unexpected exporter command line" test_paperless(simple) simple.send_monitor_command("quit")