From 2bb0a137f00857d7a18b4045c5b891004c28a245 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 8 Apr 2025 16:33:33 -0700
Subject: [PATCH] Merge settings

---
 src/documents/settings.py | 11 -----------
 src/paperless/settings.py | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 src/documents/settings.py

diff --git a/src/documents/settings.py b/src/documents/settings.py
deleted file mode 100644
index 9dff44c95..000000000
--- a/src/documents/settings.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Defines the names of file/thumbnail for the manifest
-# for exporting/importing commands
-EXPORTER_FILE_NAME = "__exported_file_name__"
-EXPORTER_THUMBNAIL_NAME = "__exported_thumbnail_name__"
-EXPORTER_ARCHIVE_NAME = "__exported_archive_name__"
-
-EXPORTER_CRYPTO_SETTINGS_NAME = "__crypto__"
-EXPORTER_CRYPTO_SALT_NAME = "__salt_hex__"
-EXPORTER_CRYPTO_KEY_ITERATIONS_NAME = "__key_iters__"
-EXPORTER_CRYPTO_KEY_SIZE_NAME = "__key_size__"
-EXPORTER_CRYPTO_ALGO_NAME = "__key_algo__"
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index b161d7016..f3f7af4cd 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -1262,3 +1262,15 @@ OUTLOOK_OAUTH_ENABLED = bool(
     and OUTLOOK_OAUTH_CLIENT_ID
     and OUTLOOK_OAUTH_CLIENT_SECRET,
 )
+
+# Defines the names of file/thumbnail for the manifest
+# for exporting/importing commands
+EXPORTER_FILE_NAME = "__exported_file_name__"
+EXPORTER_THUMBNAIL_NAME = "__exported_thumbnail_name__"
+EXPORTER_ARCHIVE_NAME = "__exported_archive_name__"
+
+EXPORTER_CRYPTO_SETTINGS_NAME = "__crypto__"
+EXPORTER_CRYPTO_SALT_NAME = "__salt_hex__"
+EXPORTER_CRYPTO_KEY_ITERATIONS_NAME = "__key_iters__"
+EXPORTER_CRYPTO_KEY_SIZE_NAME = "__key_size__"
+EXPORTER_CRYPTO_ALGO_NAME = "__key_algo__"