From 043dee8a7de4a54349d9383dbaaa2934d9515017 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:16:07 -0500
Subject: [PATCH 01/14] Added directory config options.

---
 paperless_ngx/config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index c21172e48..cf257d24b 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -62,6 +62,9 @@
     "CONFIG_LOCATION": "/config/addons_config/paperless_ng/config.yaml",
     "OCRLANG": "ENG FRA GER",
     "PAPERLESS_OCR_MODE": "skip",
+    "PAPERLESS_DATA_DIR": "/config/addons_config/paperless_ng",
+    "PAPERLESS_MEDIA_ROOT": "/config/addons_config/paperless_ng/media",
+    "PAPERLESS_CONSUMPTION_DIR": "/config/addons_config/paperless_ng/consume",
     "PGID": 0,
     "PUID": 0,
     "certfile": "fullchain.pem",

From be41e7aee633c74f1afbf16e54c8d2b31c6f9ed9 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:26:50 -0500
Subject: [PATCH 02/14] Added schema entries for folder options.

---
 paperless_ngx/config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index cf257d24b..213451a00 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -88,6 +88,9 @@
     "OCRLANG": "str?",
     "PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?",
     "PAPERLESS_URL": "str?",
+    "PAPERLESS_DATA_DIR": "str",
+    "PAPERLESS_MEDIA_ROOT": "str",
+    "PAPERLESS_CONSUMPTION_DIR": "str",
     "PGID": "int",
     "PUID": "int",
     "TZ": "str?",

From 8035ca5a40d728d153db5d9650929e05e9871b36 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:27:20 -0500
Subject: [PATCH 03/14] Removed config folder environment variables.

---
 paperless_ngx/Dockerfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index d2529e4ef..65c5c5235 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -40,11 +40,6 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi
 
-ENV \
-    PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng \
-    PAPERLESS_MEDIA_ROOT=/config/addons_config/paperless_ng/media \
-    PAPERLESS_CONSUMPTION_DIR=/config/addons_config/paperless_ng/consume
-
 # Modules
 ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh 90-config_yaml.sh"
 

From 1dfa1fb3b2105b8a7d9623509c5795aee215958c Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:35:36 -0500
Subject: [PATCH 04/14] Added folder path config options.

---
 paperless_ngx/rootfs/etc/cont-init.d/99-run.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
index d38fb5fb9..b0eb8e6f2 100755
--- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
+++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
@@ -2,6 +2,14 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2155
 
+####################
+# Define defaults #
+####################
+
+DEFAULT_PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng"
+DEFAULT_PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media"
+DEFAULT_PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume"
+
 ####################
 # Define variables #
 ####################
@@ -18,6 +26,10 @@ if bashio::config.has_value "OCRLANG"; then
 fi
 if bashio::config.has_value "PAPERLESS_OCR_MODE"; then export PAPERLESS_OCR_MODE=$(bashio::config "PAPERLESS_OCR_MODE"); fi
 
+if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_DATA_DIR"); else export $DEFAULT_PAPERLESS_DATA_DIR ; fi
+if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_MEDIA_ROOT"); else export $DEFAULT_PAPERLESS_MEDIA_ROOT ; fi
+if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); else export $DEFAULT_PAPERLESS_CONSUMPTION_DIR ; fi
+
 export PAPERLESS_ADMIN_PASSWORD="admin"
 export PAPERLESS_ADMIN_USER="admin"
 export PAPERLESS_ALLOWED_HOSTS="*"

From 93e3f8e03dd0943b0ffc5c2da7f66dedb3da3c9e Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:36:57 -0500
Subject: [PATCH 05/14] Made folder config options optional.

Defaults now stored and set in paperless_ngx/rootfs/etc/cont-init.d/99-run.sh.
---
 paperless_ngx/config.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index 213451a00..4eeaebb95 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -62,9 +62,6 @@
     "CONFIG_LOCATION": "/config/addons_config/paperless_ng/config.yaml",
     "OCRLANG": "ENG FRA GER",
     "PAPERLESS_OCR_MODE": "skip",
-    "PAPERLESS_DATA_DIR": "/config/addons_config/paperless_ng",
-    "PAPERLESS_MEDIA_ROOT": "/config/addons_config/paperless_ng/media",
-    "PAPERLESS_CONSUMPTION_DIR": "/config/addons_config/paperless_ng/consume",
     "PGID": 0,
     "PUID": 0,
     "certfile": "fullchain.pem",
@@ -88,9 +85,9 @@
     "OCRLANG": "str?",
     "PAPERLESS_OCR_MODE": "list(skip|redo|force|skip_noarchive)?",
     "PAPERLESS_URL": "str?",
-    "PAPERLESS_DATA_DIR": "str",
-    "PAPERLESS_MEDIA_ROOT": "str",
-    "PAPERLESS_CONSUMPTION_DIR": "str",
+    "PAPERLESS_DATA_DIR": "str?",
+    "PAPERLESS_MEDIA_ROOT": "str?",
+    "PAPERLESS_CONSUMPTION_DIR": "str?",
     "PGID": "int",
     "PUID": "int",
     "TZ": "str?",

From 9ce14ff7aa53cde66960c32f98c76458d0d78e65 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:56:31 -0500
Subject: [PATCH 06/14] Fix linting errors with content folders.

---
 .../rootfs/etc/cont-init.d/99-run.sh          | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
index b0eb8e6f2..34a498297 100755
--- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
+++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
@@ -2,14 +2,6 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2155
 
-####################
-# Define defaults #
-####################
-
-DEFAULT_PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng"
-DEFAULT_PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media"
-DEFAULT_PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume"
-
 ####################
 # Define variables #
 ####################
@@ -26,14 +18,18 @@ if bashio::config.has_value "OCRLANG"; then
 fi
 if bashio::config.has_value "PAPERLESS_OCR_MODE"; then export PAPERLESS_OCR_MODE=$(bashio::config "PAPERLESS_OCR_MODE"); fi
 
-if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_DATA_DIR"); else export $DEFAULT_PAPERLESS_DATA_DIR ; fi
-if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_MEDIA_ROOT"); else export $DEFAULT_PAPERLESS_MEDIA_ROOT ; fi
-if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); else export $DEFAULT_PAPERLESS_CONSUMPTION_DIR ; fi
-
 export PAPERLESS_ADMIN_PASSWORD="admin"
 export PAPERLESS_ADMIN_USER="admin"
 export PAPERLESS_ALLOWED_HOSTS="*"
 
+export PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng"
+export PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media"
+export PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume"
+
+if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_DATA_DIR"); fi
+if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_MEDIA_ROOT"); fi
+if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); fi
+
 ###################
 # Define database #
 ###################

From 0828be700ae6982489e764953e62174df3a6fadc Mon Sep 17 00:00:00 2001
From: gituser <root@local-updater.local.hass.io>
Date: Fri, 3 Feb 2023 13:05:42 -0500
Subject: [PATCH 07/14] Updater bot : paperless_ngx updated to 1.12.2

---
 paperless_ngx/CHANGELOG.md | 3 +++
 paperless_ngx/Dockerfile   | 2 +-
 paperless_ngx/config.json  | 2 +-
 paperless_ngx/updater.json | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md
index b9c23bfa9..60b8bf962 100644
--- a/paperless_ngx/CHANGELOG.md
+++ b/paperless_ngx/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 1.12.2 (03-02-2023)
+- Update to latest version from paperless-ngx/paperless-ngx
+
 ## 1.12.1 (28-01-2023)
 - Update to latest version from paperless-ngx/paperless-ngx
 
diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index 65c5c5235..642bae68c 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -16,7 +16,7 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="1.12.1"
+ARG BUILD_UPSTREAM="1.12.2"
 FROM ${BUILD_FROM}:${BUILD_UPSTREAM}
 
 ##################
diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index 4eeaebb95..4a1e4e888 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -105,6 +105,6 @@
   ],
   "slug": "paperless_ng",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "webui": "http://[HOST]:[PORT:8000]"
 }
diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json
index 98ff89c3f..f4dd2e4c1 100644
--- a/paperless_ngx/updater.json
+++ b/paperless_ngx/updater.json
@@ -1,9 +1,9 @@
 {
   "github_fulltag": "false",
-  "last_update": "28-01-2023",
+  "last_update": "03-02-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "paperless_ngx",
   "source": "github",
   "upstream_repo": "paperless-ngx/paperless-ngx",
-  "upstream_version": "1.12.1"
+  "upstream_version": "1.12.2"
 }

From 39cabbc35d731c42d9ce9d5a8b9c3b59a52213b2 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 18:38:42 +0000
Subject: [PATCH 08/14] Updated changelog

---
 paperless_ngx/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md
index 60b8bf962..4d7e81033 100644
--- a/paperless_ngx/CHANGELOG.md
+++ b/paperless_ngx/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 ## 1.12.2 (03-02-2023)
 - Update to latest version from paperless-ngx/paperless-ngx
+- Added consumption/media/data paths to addon config screen.
 
 ## 1.12.1 (28-01-2023)
 - Update to latest version from paperless-ngx/paperless-ngx

From ce7dabf5bdef982e4837aeab24f6441b8ffa93f9 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 18:44:56 +0000
Subject: [PATCH 09/14] Fixed folder variable name issue in 99-run.

---
 paperless_ngx/rootfs/etc/cont-init.d/99-run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
index 34a498297..e2871efad 100755
--- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
+++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
@@ -26,9 +26,9 @@ export PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng"
 export PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media"
 export PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume"
 
-if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_DATA_DIR"); fi
-if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_MEDIA_ROOT"); fi
-if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); fi
+if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_DATA_DIR=$(bashio::config "PAPERLESS_DATA_DIR"); fi
+if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_MEDIA_ROOT=$(bashio::config "PAPERLESS_MEDIA_ROOT"); fi
+if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_CONSUMPTION_DIR=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); fi
 
 ###################
 # Define database #

From 7835d4c497b1d9e1a8dcc6b7e68f9023eee6d8c6 Mon Sep 17 00:00:00 2001
From: Elahd Bar-Shai <466460+elahd@users.noreply.github.com>
Date: Fri, 3 Feb 2023 19:32:56 +0000
Subject: [PATCH 10/14] Undo paperless version update. Needs up by updated by
 repo owner.

---
 paperless_ngx/Dockerfile   | 2 +-
 paperless_ngx/config.json  | 2 +-
 paperless_ngx/updater.json | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index 642bae68c..65c5c5235 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -16,7 +16,7 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="1.12.2"
+ARG BUILD_UPSTREAM="1.12.1"
 FROM ${BUILD_FROM}:${BUILD_UPSTREAM}
 
 ##################
diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index 4a1e4e888..4eeaebb95 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -105,6 +105,6 @@
   ],
   "slug": "paperless_ng",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.12.2",
+  "version": "1.12.1",
   "webui": "http://[HOST]:[PORT:8000]"
 }
diff --git a/paperless_ngx/updater.json b/paperless_ngx/updater.json
index f4dd2e4c1..98ff89c3f 100644
--- a/paperless_ngx/updater.json
+++ b/paperless_ngx/updater.json
@@ -1,9 +1,9 @@
 {
   "github_fulltag": "false",
-  "last_update": "03-02-2023",
+  "last_update": "28-01-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "paperless_ngx",
   "source": "github",
   "upstream_repo": "paperless-ngx/paperless-ngx",
-  "upstream_version": "1.12.2"
+  "upstream_version": "1.12.1"
 }

From 510414a6976479d03fc779a19725f63749a39326 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 4 Feb 2023 07:36:46 +0100
Subject: [PATCH 11/14] Create folder

---
 paperless_ngx/rootfs/etc/cont-init.d/99-run.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
index e2871efad..2bda57952 100755
--- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
+++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
@@ -30,6 +30,12 @@ if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_DATA_DIR
 if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_MEDIA_ROOT=$(bashio::config "PAPERLESS_MEDIA_ROOT"); fi
 if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_CONSUMPTION_DIR=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); fi
 
+for folder in "$PAPERLESS_DATA_DIR" "$PAPERLESS_MEDIA_ROOT" "$PAPERLESS_CONSUMPTION_DIR"; do
+  mkdir -p "$folder"
+  chmod -R 755 "$folder"
+  chown -R paperless:paperless "$folder"
+done
+
 ###################
 # Define database #
 ###################

From 8ad539d0b8391e205cdd3b1e3d0f45b19014fb89 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 4 Feb 2023 07:37:56 +0100
Subject: [PATCH 12/14] New version incremental

---
 paperless_ngx/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index 4eeaebb95..150eea030 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -105,6 +105,6 @@
   ],
   "slug": "paperless_ng",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.12.1",
+  "version": "1.12.2-1",
   "webui": "http://[HOST]:[PORT:8000]"
 }

From 84ebb40e28d5665d190e3695f01c2ed87a7f5420 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 4 Feb 2023 07:38:26 +0100
Subject: [PATCH 13/14] Align with upstream

---
 paperless_ngx/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paperless_ngx/CHANGELOG.md b/paperless_ngx/CHANGELOG.md
index 4d7e81033..cfe0f0cd1 100644
--- a/paperless_ngx/CHANGELOG.md
+++ b/paperless_ngx/CHANGELOG.md
@@ -1,5 +1,5 @@
 
-## 1.12.2 (03-02-2023)
+## 1.12.2 (04-02-2023)
 - Update to latest version from paperless-ngx/paperless-ngx
 - Added consumption/media/data paths to addon config screen.
 

From 6699ee23e1c3f11784f84d3bd05d450148e3cd6f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 4 Feb 2023 07:43:50 +0100
Subject: [PATCH 14/14] Correct merge

---
 paperless_ngx/config.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/paperless_ngx/config.json b/paperless_ngx/config.json
index d0e49f67f..150eea030 100644
--- a/paperless_ngx/config.json
+++ b/paperless_ngx/config.json
@@ -105,8 +105,6 @@
   ],
   "slug": "paperless_ng",
   "url": "https://github.com/alexbelgium/hassio-addons",
-
   "version": "1.12.2-1",
-
   "webui": "http://[HOST]:[PORT:8000]"
 }