Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jonas Winkler
2018-09-25 14:47:12 +02:00
17 changed files with 486 additions and 195 deletions

3
src/paperless/settings.py Normal file → Executable file
View File

@@ -149,8 +149,9 @@ if os.getenv("PAPERLESS_DBENGINE"):
"ENGINE": os.getenv("PAPERLESS_DBENGINE"),
"NAME": os.getenv("PAPERLESS_DBNAME", "paperless"),
"USER": os.getenv("PAPERLESS_DBUSER"),
"PASSWORD": os.getenv("PAPERLESS_DBPASS")
}
if os.getenv("PAPERLESS_DBPASS"):
DATABASES["default"]["PASSWORD"] = os.getenv("PAPERLESS_DBPASS")
# Password validation