From 7bd49f1da56611d630ab77bc72d9943cfdb52e72 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 21 Sep 2020 08:27:12 -0700 Subject: [PATCH] Renames settings variables --- .env.example | 2 +- celerywyrm/settings.py | 6 +++--- rebuilddb.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index dbb5e0bf..f6218daa 100644 --- a/.env.example +++ b/.env.example @@ -13,7 +13,7 @@ OL_URL=https://openlibrary.org ## Database backend to use. ## Default is postgres, sqlite is for dev quickstart only (NOT production!!!) -FEDIREADS_DATABASE_BACKEND=postgres +BOOKWYRM_DATABASE_BACKEND=postgres MEDIA_ROOT=images/ diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py index f7fd77dd..d8cb1f2e 100644 --- a/celerywyrm/settings.py +++ b/celerywyrm/settings.py @@ -85,9 +85,9 @@ WSGI_APPLICATION = 'celerywyrm.wsgi.application' # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases -FEDIREADS_DATABASE_BACKEND = env('FEDIREADS_DATABASE_BACKEND', 'postgres') +BOOKWYRM_DATABASE_BACKEND = env('BOOKWYRM_DATABASE_BACKEND', 'postgres') -FEDIREADS_DBS = { +BOOKWYRM_DBS = { 'postgres': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': env('POSTGRES_DB', 'bookwyrm'), @@ -103,7 +103,7 @@ FEDIREADS_DBS = { } DATABASES = { - 'default': FEDIREADS_DBS[FEDIREADS_DATABASE_BACKEND] + 'default': BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND] } diff --git a/rebuilddb.sh b/rebuilddb.sh index 09d024aa..99be0268 100755 --- a/rebuilddb.sh +++ b/rebuilddb.sh @@ -8,7 +8,7 @@ fi source .env -if [ $FEDIREADS_DATABASE_BACKEND = 'sqlite' ]; then +if [ $BOOKWYRM_DATABASE_BACKEND = 'sqlite' ]; then if [ -f fedireads.db ]; then rm fedireads.db fi