From 4bdecbaba36b3642912012af1f5f5d6cb174cb01 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Sat, 19 Mar 2022 01:00:10 +0100
Subject: [PATCH] Update to 2022-03-19 01:00

---
 roles/paperless_ng/defaults/main.yml      | 6 +++---
 roles/paperless_ng/tasks/archive_post.yml | 4 ++++
 roles/paperless_ng/tasks/cleanup.yml      | 6 +++---
 roles/paperless_ng/tasks/install.yml      | 6 +++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/roles/paperless_ng/defaults/main.yml b/roles/paperless_ng/defaults/main.yml
index 154cd40..699bd81 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.5.0
+paperless_version: 1.6.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/jonaswinkler/paperless-ng/releases/download/ng-{{ paperless_version }}/paperless-ng-{{ paperless_version }}.tar.xz
+paperless_archive_url: https://github.com/paperless-ngx/paperless-ngx/releases/download/ngx-{{ paperless_version }}/paperless-ngx-{{ paperless_version }}.tar.xz
 # Expected checksum
-paperless_archive_sha1: edbbbfde6718ee7586acf1212d32ca379058cb15
+paperless_archive_sha256: f4971abf258382fb171a8d11f4c6181ca03b42334deb6d9305a04ea8f8eab91e
 # 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/tasks/archive_post.yml b/roles/paperless_ng/tasks/archive_post.yml
index f15bfe1..d18e286 100644
--- a/roles/paperless_ng/tasks/archive_post.yml
+++ b/roles/paperless_ng/tasks/archive_post.yml
@@ -8,3 +8,7 @@
   environment:
     ZSTD_CLEVEL: 10
   tags: ged
+
+- name: Remove archive tmp dir
+  file: path={{ paperless_root_dir }}/archives/{{ paperless_current_version }} state=absent
+  tags: ged
diff --git a/roles/paperless_ng/tasks/cleanup.yml b/roles/paperless_ng/tasks/cleanup.yml
index 84d42bc..f9ff584 100644
--- a/roles/paperless_ng/tasks/cleanup.yml
+++ b/roles/paperless_ng/tasks/cleanup.yml
@@ -3,7 +3,7 @@
 - name: Remove tmp and obsolete files
   file: path={{ item }} state=absent
   loop:
-    - "{{ paperless_root_dir }}/archives/{{ paperless_current_version }}"
-    - "{{ paperless_root_dir }}/tmp/paperless-ng-{{ paperless_version }}.tar.xz"
-    - "{{ paperless_root_dir }}/tmp/paperless-ng"
+    - "{{ paperless_root_dir }}/tmp/paperless-ngx-{{ paperless_version }}.tar.xz"
+    - "{{ paperless_root_dir }}/tmp/paperless-ngx"
   tags: ged
+
diff --git a/roles/paperless_ng/tasks/install.yml b/roles/paperless_ng/tasks/install.yml
index 1d1f46c..c06ad5d 100644
--- a/roles/paperless_ng/tasks/install.yml
+++ b/roles/paperless_ng/tasks/install.yml
@@ -10,17 +10,17 @@
       get_url:
         url: "{{ paperless_archive_url }}"
         dest: "{{ paperless_root_dir }}/tmp"
-        checksum: sha1:{{ paperless_archive_sha1 }}
+        checksum: sha256:{{ paperless_archive_sha256 }}
 
     - name: Extract archive
       unarchive:
-        src: "{{ paperless_root_dir }}/tmp/paperless-ng-{{ paperless_version }}.tar.xz"
+        src: "{{ paperless_root_dir }}/tmp/paperless-ngx-{{ paperless_version }}.tar.xz"
         dest: "{{ paperless_root_dir }}/tmp"
         remote_src: True
 
     - name: Move paperless app
       synchronize:
-        src: "{{ paperless_root_dir }}/tmp/paperless-ng/"
+        src: "{{ paperless_root_dir }}/tmp/paperless-ngx/"
         dest: "{{ paperless_root_dir }}/app/"
         delete: True
         compress: False