From 36ec3ae4e5a905585e444cf364f005c6a12a381e Mon Sep 17 00:00:00 2001 From: Daoud Clarke Date: Thu, 26 Oct 2023 17:32:46 +0100 Subject: [PATCH] Add database config --- mwmbl/settings_common.py | 11 ----------- mwmbl/settings_dev.py | 9 +++++++++ mwmbl/settings_prod.py | 7 +++++++ poetry.lock | 18 +++++++++++++++++- pyproject.toml | 1 + 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/mwmbl/settings_common.py b/mwmbl/settings_common.py index e223c1b..ea038fc 100644 --- a/mwmbl/settings_common.py +++ b/mwmbl/settings_common.py @@ -72,17 +72,6 @@ TEMPLATES = [ WSGI_APPLICATION = 'mwmbl.wsgi.application' -# Database -# https://docs.djangoproject.com/en/4.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - # Password validation # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators diff --git a/mwmbl/settings_dev.py b/mwmbl/settings_dev.py index c7cd281..953b0dc 100644 --- a/mwmbl/settings_dev.py +++ b/mwmbl/settings_dev.py @@ -1,5 +1,14 @@ from mwmbl.settings_common import * + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + DEBUG = True ALLOWED_HOSTS = ["localhost", "127.0.0.1"] diff --git a/mwmbl/settings_prod.py b/mwmbl/settings_prod.py index e2f4d11..ca90bad 100644 --- a/mwmbl/settings_prod.py +++ b/mwmbl/settings_prod.py @@ -1,5 +1,12 @@ +import os + +import dj_database_url + from mwmbl.settings_common import * + +DATABASES = {'default': dj_database_url.config(default=os.environ["DATABASE_URL"])} + DEBUG = False ALLOWED_HOSTS = ["api.mwmbl.org", "mwmbl.org"] diff --git a/poetry.lock b/poetry.lock index f4395b2..0808bb5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -520,6 +520,22 @@ files = [ {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, ] +[[package]] +name = "dj-database-url" +version = "2.1.0" +description = "Use Database URLs in your Django Application." +category = "main" +optional = false +python-versions = "*" +files = [ + {file = "dj-database-url-2.1.0.tar.gz", hash = "sha256:f2042cefe1086e539c9da39fad5ad7f61173bf79665e69bf7e4de55fa88b135f"}, + {file = "dj_database_url-2.1.0-py3-none-any.whl", hash = "sha256:04bc34b248d4c21aaa13e4ab419ae6575ef5f10f3df735ce7da97722caa356e0"}, +] + +[package.dependencies] +Django = ">=3.2" +typing-extensions = ">=3.10.0.0" + [[package]] name = "django" version = "4.2.6" @@ -2599,4 +2615,4 @@ indexer = ["ujson", "warcio", "idna", "beautifulsoup4", "lxml", "langdetect", "p [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.11" -content-hash = "13572a7df206102ce30a6deb1eecd22b5b217a96f864a7dd6c558a7ca263d520" +content-hash = "37c79d582b976c81d731ea9bac38911f8cf578ae72fe715e23ab7d1236712f81" diff --git a/pyproject.toml b/pyproject.toml index a0de7fd..548dacf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,7 @@ django-ninja = "^0.22.2" requests-cache = "^1.1.0" redis = {extras = ["hiredis"], version = "^5.0.1"} django-allauth = "^0.57.0" +dj-database-url = "^2.1.0" [tool.poetry.extras] indexer = [