From 93fb1be253a3703f6d85645dc9cbd837dbe1959d Mon Sep 17 00:00:00 2001 From: Jeff Bogatay Date: Tue, 23 Aug 2016 12:18:28 -0400 Subject: [PATCH 1/4] Make database location variable --- src/paperless/settings.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index c80434bc7..1e946d0b0 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -31,6 +31,11 @@ LOGIN_URL = '/admin/login' ALLOWED_HOSTS = [] +# Tap paperless.conf if it's available +if os.path.exists("/etc/paperless.conf"): + load_dotenv("/etc/paperless.conf") + + # Application definition @@ -90,9 +95,10 @@ WSGI_APPLICATION = 'paperless.wsgi.application' DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", - "NAME": os.path.join(BASE_DIR, "..", "data", "db.sqlite3"), + "NAME": os.path.join(os.getenv("PAPERLESS_DBLOCATION",os.path.join(BASE_DIR, "..", "data")), "db.sqlite3") } } +print(DATABASES) if os.getenv("PAPERLESS_DBUSER") and os.getenv("PAPERLESS_DBPASS"): DATABASES["default"] = { "ENGINE": "django.db.backends.postgresql_psycopg2", @@ -150,11 +156,6 @@ MEDIA_URL = "/media/" # values in /etc/paperless.conf instead. # ---------------------------------------------------------------------------- -# Tap paperless.conf if it's available -if os.path.exists("/etc/paperless.conf"): - load_dotenv("/etc/paperless.conf") - - # Logging LOGGING = { From fc00416e32a76acf9a560c3f2d2846da0519967d Mon Sep 17 00:00:00 2001 From: Jeff Bogatay Date: Tue, 23 Aug 2016 12:22:36 -0400 Subject: [PATCH 2/4] Remove debug stuff --- src/paperless/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 1e946d0b0..dcb87a248 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -98,7 +98,7 @@ DATABASES = { "NAME": os.path.join(os.getenv("PAPERLESS_DBLOCATION",os.path.join(BASE_DIR, "..", "data")), "db.sqlite3") } } -print(DATABASES) + if os.getenv("PAPERLESS_DBUSER") and os.getenv("PAPERLESS_DBPASS"): DATABASES["default"] = { "ENGINE": "django.db.backends.postgresql_psycopg2", From c196e2eb6625458aacfc7e0bb96e88dde7d1de68 Mon Sep 17 00:00:00 2001 From: Jeff Bogatay Date: Tue, 23 Aug 2016 12:24:51 -0400 Subject: [PATCH 3/4] Document new ENV variable --- paperless.conf.example | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/paperless.conf.example b/paperless.conf.example index 85709698f..3ba8c6693 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -80,3 +80,8 @@ PAPERLESS_SHARED_SECRET="" # For more information on how to use this value, you should probably search # the web for "MAGICK_TMPDIR". #PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless + +# You can specify where you want the SQLite database to be stored instead of +# the default location +#PAPERLESS_DBLOCATION=/path/to/database/file + From a1cd05f9e2ffc7758b865316ec97e830c3f5d965 Mon Sep 17 00:00:00 2001 From: Jeff Bogatay Date: Tue, 23 Aug 2016 13:28:08 -0400 Subject: [PATCH 4/4] Prettify code, change ENV variable name --- paperless.conf.example | 2 +- src/paperless/settings.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/paperless.conf.example b/paperless.conf.example index 3ba8c6693..6b2a102ab 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -83,5 +83,5 @@ PAPERLESS_SHARED_SECRET="" # You can specify where you want the SQLite database to be stored instead of # the default location -#PAPERLESS_DBLOCATION=/path/to/database/file +#PAPERLESS_DBDIR=/path/to/database/file diff --git a/src/paperless/settings.py b/src/paperless/settings.py index dcb87a248..de25313c6 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -95,7 +95,13 @@ WSGI_APPLICATION = 'paperless.wsgi.application' DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", - "NAME": os.path.join(os.getenv("PAPERLESS_DBLOCATION",os.path.join(BASE_DIR, "..", "data")), "db.sqlite3") + "NAME": os.path.join( + os.getenv( + "PAPERLESS_DBDIR", + os.path.join(BASE_DIR, "..", "data") + ), + "db.sqlite3" + ) } }