Merge branch 'dev' into feature-permissions

This commit is contained in:
Michael Shamoon 2022-12-29 20:12:42 -08:00
commit d71d388c08
60 changed files with 23029 additions and 6824 deletions

View file

@ -17,7 +17,10 @@ from django.utils.translation import gettext_lazy as _
from dotenv import load_dotenv
# Tap paperless.conf if it's available
if os.path.exists("../paperless.conf"):
configuration_path = os.getenv("PAPERLESS_CONFIGURATION_PATH")
if configuration_path and os.path.exists(configuration_path):
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")