diff options
Diffstat (limited to 'deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py')
| -rw-r--r-- | deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py b/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py index 0631a458caf6..c29b74ddd28c 100644 --- a/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py +++ b/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py @@ -1,15 +1,14 @@ ---- src/paperless/settings.py.orig 2025-04-19 22:34:42 UTC +--- src/paperless/settings.py.orig 2025-08-17 20:46:35 UTC +++ src/paperless/settings.py -@@ -21,8 +21,6 @@ if configuration_path and os.path.exists(configuration - load_dotenv(configuration_path) - elif os.path.exists("../paperless.conf"): - load_dotenv("../paperless.conf") --elif os.path.exists("/etc/paperless.conf"): -- load_dotenv("/etc/paperless.conf") - elif os.path.exists("/usr/local/etc/paperless.conf"): - load_dotenv("/usr/local/etc/paperless.conf") - -@@ -267,7 +265,7 @@ THUMBNAIL_DIR = MEDIA_ROOT / "documents" / "thumbnails +@@ -25,7 +25,6 @@ logger = logging.getLogger("paperless.settings") + for path in [ + os.getenv("PAPERLESS_CONFIGURATION_PATH"), + "../paperless.conf", +- "/etc/paperless.conf", + "/usr/local/etc/paperless.conf", + ]: + if path and Path(path).exists(): +@@ -273,7 +272,7 @@ THUMBNAIL_DIR = MEDIA_ROOT / "documents" / "thumbnails DATA_DIR = __get_path("PAPERLESS_DATA_DIR", BASE_DIR.parent / "data") @@ -17,8 +16,8 @@ +NLTK_DIR = __get_path("PAPERLESS_NLTK_DIR", "/usr/local/share/nltk_data") # Check deprecated setting first - EMPTY_TRASH_DIR = os.getenv( -@@ -1106,7 +1104,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean( + EMPTY_TRASH_DIR = ( +@@ -1279,7 +1278,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean( THUMBNAIL_FONT_NAME = os.getenv( "PAPERLESS_THUMBNAIL_FONT_NAME", |