From fdc74d08ac1417bef7c71baddef9c9ca90c34d0c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 28 Nov 2022 12:00:11 +0100
Subject: [PATCH] Update to 2022-11-28 12:00

---
 roles/paperless_ng/defaults/main.yml          |  4 ++--
 roles/paperless_ng/handlers/main.yml          |  1 +
 roles/paperless_ng/tasks/install.yml          |  1 +
 roles/paperless_ng/tasks/services.yml         |  1 +
 .../templates/paperless-scheduler.service.j2  |  2 +-
 .../templates/paperless-task-queue.service.j2 | 22 +++++++++++++++++++
 6 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 roles/paperless_ng/templates/paperless-task-queue.service.j2

diff --git a/roles/paperless_ng/defaults/main.yml b/roles/paperless_ng/defaults/main.yml
index a2e914e..e04ea55 100644
--- a/roles/paperless_ng/defaults/main.yml
+++ b/roles/paperless_ng/defaults/main.yml
@@ -1,13 +1,13 @@
 ---
 
 # The version to deploy
-paperless_version: 1.9.2
+paperless_version: 1.10.0
 # Instance ID, as you can deploy several instances on the same server
 paperless_id: 1
 # URL of the paperless archive
 paperless_archive_url: https://github.com/paperless-ngx/paperless-ngx/releases/download/v{{ paperless_version }}/paperless-ngx-v{{ paperless_version }}.tar.xz
 # Expected checksum
-paperless_archive_sha256: 7da7e355745fcc5ac837323f22f7e6d556386297a61e41f04e104fe785e85cce
+paperless_archive_sha256: 8b802deef7a8d364b72cae165b1a6c772ba49dc13de9674f7811f2d8689c279e
 # Should ansible handle install and upgrades, or only initial install
 paperless_manage_upgrade: True
 # Root directory where paperless will be installed
diff --git a/roles/paperless_ng/handlers/main.yml b/roles/paperless_ng/handlers/main.yml
index e84b3b1..2c86083 100644
--- a/roles/paperless_ng/handlers/main.yml
+++ b/roles/paperless_ng/handlers/main.yml
@@ -5,5 +5,6 @@
   loop:
     - paperless_{{ paperless_id }}-webserver
     - paperless_{{ paperless_id }}-scheduler
+    - paperless_{{ paperless_id }}-task-queue
     - paperless_{{ paperless_id }}-consumer
 
diff --git a/roles/paperless_ng/tasks/install.yml b/roles/paperless_ng/tasks/install.yml
index 33bc646..0b5ce25 100644
--- a/roles/paperless_ng/tasks/install.yml
+++ b/roles/paperless_ng/tasks/install.yml
@@ -90,6 +90,7 @@
   loop:
     - paperless-webserver
     - paperless-scheduler
+    - paperless-task-queue
     - paperless-consumer
   notify: restart paperless
   register: paperless_units
diff --git a/roles/paperless_ng/tasks/services.yml b/roles/paperless_ng/tasks/services.yml
index f417d37..4f8c62e 100644
--- a/roles/paperless_ng/tasks/services.yml
+++ b/roles/paperless_ng/tasks/services.yml
@@ -5,5 +5,6 @@
   loop:
     - paperless_{{ paperless_id }}-webserver
     - paperless_{{ paperless_id }}-scheduler
+    - paperless_{{ paperless_id }}-task-queue
     - paperless_{{ paperless_id }}-consumer
   tags: ged
diff --git a/roles/paperless_ng/templates/paperless-scheduler.service.j2 b/roles/paperless_ng/templates/paperless-scheduler.service.j2
index 5186bc8..127247c 100644
--- a/roles/paperless_ng/templates/paperless-scheduler.service.j2
+++ b/roles/paperless_ng/templates/paperless-scheduler.service.j2
@@ -6,7 +6,7 @@ After=redis.service postgresql.service
 User={{ paperless_user }}
 Group={{ paperless_user }}
 WorkingDirectory={{ paperless_root_dir }}/app/src
-ExecStart={{ paperless_root_dir }}/venv/bin/python3 manage.py qcluster
+ExecStart={{ paperless_root_dir }}/venv/bin/celery --app paperless beat --loglevel INFO
 PrivateTmp=yes
 PrivateDevices=yes
 ProtectSystem=full
diff --git a/roles/paperless_ng/templates/paperless-task-queue.service.j2 b/roles/paperless_ng/templates/paperless-task-queue.service.j2
new file mode 100644
index 0000000..6aafcd9
--- /dev/null
+++ b/roles/paperless_ng/templates/paperless-task-queue.service.j2
@@ -0,0 +1,22 @@
+[Unit]
+Description=Paperless scheduler
+After=redis.service postgresql.service
+
+[Service]
+User={{ paperless_user }}
+Group={{ paperless_user }}
+WorkingDirectory={{ paperless_root_dir }}/app/src
+ExecStart={{ paperless_root_dir }}/venv/bin/celery --app paperless worker --loglevel INFO
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectSystem=full
+ProtectHome=yes
+NoNewPrivileges=yes
+MemoryLimit=1024M
+SyslogIdentifier=paperless-scheduler
+Restart=on-failure
+StartLimitInterval=0
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target