mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-06-02 21:24:32 -04:00
Merge settings
This commit is contained in:
parent
fbd5fb29ca
commit
2bb0a137f0
@ -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__"
|
|
@ -1262,3 +1262,15 @@ OUTLOOK_OAUTH_ENABLED = bool(
|
|||||||
and OUTLOOK_OAUTH_CLIENT_ID
|
and OUTLOOK_OAUTH_CLIENT_ID
|
||||||
and OUTLOOK_OAUTH_CLIENT_SECRET,
|
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__"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user