Merge branch 'db-config' into dev

This commit is contained in:
Jonas Winkler 2018-07-15 13:41:54 +02:00
commit b059602050
3 changed files with 14 additions and 4 deletions

View File

@ -3,6 +3,16 @@
# As this file contains passwords it should only be readable by the user # As this file contains passwords it should only be readable by the user
# running paperless. # running paperless.
###############################################################################
#### Database Settings ####
###############################################################################
# By default, sqlite is used as the database backend. This can be changed here.
#PAPERLESS_DBENGINE="django.db.backends.postgresql_psycopg2"
#PAPERLESS_DBNAME="paperless"
#PAPERLESS_DBUSER="paperless"
#PAPERLESS_DBPASS="paperless"
############################################################################### ###############################################################################
#### Paths & Folders #### #### Paths & Folders ####

4
src/documents/checks.py Normal file → Executable file
View File

@ -2,7 +2,7 @@ import textwrap
from django.conf import settings from django.conf import settings
from django.core.checks import Error, register from django.core.checks import Error, register
from django.db.utils import OperationalError from django.db.utils import OperationalError, ProgrammingError
@register() @register()
@ -14,7 +14,7 @@ def changed_password_check(app_configs, **kwargs):
try: try:
encrypted_doc = Document.objects.filter( encrypted_doc = Document.objects.filter(
storage_type=Document.STORAGE_TYPE_GPG).first() storage_type=Document.STORAGE_TYPE_GPG).first()
except OperationalError: except (OperationalError, ProgrammingError):
return [] # No documents table yet return [] # No documents table yet
if encrypted_doc: if encrypted_doc:

View File

@ -135,9 +135,9 @@ DATABASES = {
} }
} }
if os.getenv("PAPERLESS_DBUSER") and os.getenv("PAPERLESS_DBPASS"): if os.getenv("PAPERLESS_DBENGINE"):
DATABASES["default"] = { DATABASES["default"] = {
"ENGINE": "django.db.backends.postgresql_psycopg2", "ENGINE": os.getenv("PAPERLESS_DBENGINE"),
"NAME": os.getenv("PAPERLESS_DBNAME", "paperless"), "NAME": os.getenv("PAPERLESS_DBNAME", "paperless"),
"USER": os.getenv("PAPERLESS_DBUSER"), "USER": os.getenv("PAPERLESS_DBUSER"),
"PASSWORD": os.getenv("PAPERLESS_DBPASS") "PASSWORD": os.getenv("PAPERLESS_DBPASS")