about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Brandes <florian.brandes@posteo.de>2023-01-02 12:19:27 +0100
committerFlorian Brandes <florian.brandes@posteo.de>2023-01-02 15:21:45 +0100
commit5b6881f4a0797cf7cc6c3350c4bc784a851e0124 (patch)
tree928db0c4a189dae0bf419a814128572d4f2b5f6c /nixos
parent9ec889b4b81b5323afe0066a0b132fd2b4188cbe (diff)
nixos/paperless-ngx: fix startup order
The nixOS test failed sporadically with a timeout.
This is due to a race condition in the startup  of
the scheduler vs the task-queue.

The scheduler runs the migration scripts in "pre-start" and
celery isn't available, yet. The celery worker (paperless-task-queue)
was already started by systemd but was unable to connect
(as the migration scripts from "pre-start" still ran).

This fix adds the necessary "after" condition in the systemd
worker unit and adds a test to "paperless"

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/paperless.nix1
-rw-r--r--nixos/tests/paperless.nix4
2 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 33a8394dff2d2..54c53a0113438 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -258,6 +258,7 @@ in
         PrivateNetwork = false;
       };
       environment = env;
+      after = [ "paperless-scheduler.service" ];
     };
 
     # Reading the user-provided password file requires root access
diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix
index b97834835c2c9..7f36de4c29b71 100644
--- a/nixos/tests/paperless.nix
+++ b/nixos/tests/paperless.nix
@@ -26,6 +26,10 @@ import ./make-test-python.nix ({ lib, ... }: {
         # Wait until server accepts connections
         machine.wait_until_succeeds("curl -fs localhost:28981")
 
+    # Required for consuming documents via the web interface
+    with subtest("Task-queue gets ready"):
+        machine.wait_for_unit("paperless-task-queue.service")
+
     with subtest("Add a document via the web interface"):
         machine.succeed(
             "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black "