From 734fd7c0fc7ca604adef1f09a26ca7f0cf0e9fba Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Tue, 23 Feb 2021 08:35:10 +0100
Subject: [PATCH] Update exposed configuration variables

Include the newly added OCR clean and deskew parameters
---
 ansible/defaults/main.yml | 11 ++++++++---
 ansible/tasks/main.yml    | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ansible/defaults/main.yml b/ansible/defaults/main.yml
index f1cbb8f88..0a5824608 100644
--- a/ansible/defaults/main.yml
+++ b/ansible/defaults/main.yml
@@ -18,8 +18,9 @@ paperlessng_directory: /opt/paperless-ng
 paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
 paperlessng_data_dir: "{{ paperlessng_directory }}/data"
 paperlessng_media_root: "{{ paperlessng_directory }}/media"
-paperlessng_static_dir: "{{ paperlessng_directory }}/static"
+paperlessng_staticdir: "{{ paperlessng_directory }}/static"
 paperlessng_filename_format:
+paperlessng_logging_dir: "{{ paperlessng_data_dir }}/log"
 paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
 
 # Hosting & Security
@@ -36,12 +37,15 @@ paperlessng_enable_http_remote_user: False
 paperlessng_ocr_languages:
   - eng
 paperlessng_ocr_mode: skip
+paperlessng_ocr_clean: clean
+paperlessng_ocr_deskew: True
+paperlessng_ocr_rotate_pages: True
+paperlessng_ocr_rotate_pages_threshold: 12
 paperlessng_ocr_output_type: pdfa
 paperlessng_ocr_pages: 0
 paperlessng_ocr_image_dpi:
 # see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr
 paperlessng_ocr_user_args:
-  #- "deskew": True  # https://github.com/jonaswinkler/paperless-ng/issues/231
   - "optimize": 1
 paperlessng_use_jbig2enc: True
 paperlessng_big2enc_lossy: False
@@ -57,10 +61,11 @@ paperlessng_consumer_polling: 0
 paperlessng_consumer_delete_duplicates: False
 paperlessng_consumer_recursive: False
 paperlessng_consumer_subdirs_as_tags: False
+paperlessng_convert_memory_limit: 0
+paperlessng_convert_tmpdir:
 paperlessng_optimize_thumbnails: True
 paperlessng_post_consume_script:
 paperlessng_filename_date_order:
-paperlessng_filename_parse_transforms:
 paperlessng_thumbnail_font_name: /usr/share/fonts/liberation/LiberationSerif-Regular.ttf
 paperlessng_ignore_dates: ""
 
diff --git a/ansible/tasks/main.yml b/ansible/tasks/main.yml
index bfaf8df17..ad16e2b0c 100644
--- a/ansible/tasks/main.yml
+++ b/ansible/tasks/main.yml
@@ -256,7 +256,7 @@
     - "{{ paperlessng_consumption_dir }}"
     - "{{ paperlessng_data_dir }}"
     - "{{ paperlessng_media_root }}"
-    - "{{ paperlessng_static_dir }}"
+    - "{{ paperlessng_staticdir }}"
 
 - name: rename initial config
   command:
@@ -280,9 +280,11 @@
     - regexp: PAPERLESS_MEDIA_ROOT
       line: "PAPERLESS_MEDIA_ROOT={{ paperlessng_media_root }}"
     - regexp: PAPERLESS_STATICDIR
-      line: "PAPERLESS_STATICDIR={{ paperlessng_static_dir }}"
+      line: "PAPERLESS_STATICDIR={{ paperlessng_staticdir }}"
     - regexp: PAPERLESS_FILENAME_FORMAT
       line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
+    - regexp: PAPERLESS_LOGGING_DIR
+      line: "PAPERLESS_LOGGING_DIR={{ paperlessng_logging_dir }}"
     # Hosting & Security
     - regexp: PAPERLESS_SECRET_KEY
       line: "PAPERLESS_SECRET_KEY={{ paperlessng_secret_key }}"
@@ -305,6 +307,14 @@
       line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') }}"
     - regexp: PAPERLESS_OCR_MODE
       line: "PAPERLESS_OCR_MODE={{ paperlessng_ocr_mode }}"
+    - regexp: PAPERLESS_OCR_CLEAN
+      line: "PAPERLESS_OCR_CLEAN={{ paperlessng_ocr_clean }}"
+    - regexp: PAPERLESS_OCR_DESKEW
+      line: "PAPERLESS_OCR_DESKEW={{ paperlessng_ocr_deskew }}"
+    - regexp: PAPERLESS_OCR_ROTATE_PAGES
+      line: "PAPERLESS_OCR_ROTATE_PAGES={{ paperlessng_ocr_rotate_pages }}"
+    - regexp: PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD
+      line: "PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD={{ paperlessng_ocr_rotate_pages_threshold }}"
     - regexp: PAPERLESS_OCR_OUTPUT_TYPE
       line: "PAPERLESS_OCR_OUTPUT_TYPE={{ paperlessng_ocr_output_type }}"
     - regexp: PAPERLESS_OCR_PAGES
@@ -331,6 +341,10 @@
       line: "PAPERLESS_CONSUMER_RECURSIVE={{ paperlessng_consumer_recursive }}"
     - regexp: PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS
       line: "PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS={{ paperlessng_consumer_subdirs_as_tags }}"
+    - regexp: PAPERLESS_CONVERT_MEMORY_LIMIT
+      line: "PAPERLESS_CONVERT_MEMORY_LIMIT={{ paperlessng_convert_memory_limit }}"
+    - regexp: PAPERLESS_CONVERT_TMPDIR
+      line: "PAPERLESS_CONVERT_TMPDIR={{ paperlessng_convert_tmpdir }}"
     - regexp: PAPERLESS_OPTIMIZE_THUMBNAILS
       line: "PAPERLESS_OPTIMIZE_THUMBNAILS={{ paperlessng_optimize_thumbnails }}"
     - regexp: PAPERLESS_POST_CONSUME_SCRIPT