Merge pull request #10 from RustamovAkrom/main

Main

Author: RustamovAkrom

.env-example

@@ -16,15 +16,15 @@ DJANGO_SETTINGS_MODULE=core.settings.development # default
 PRIVATE_KEY_PATH=security_settings/private_key.pem
 PUBLIC_KEY_PATH=security_settings/public_key.pem
 
-#### Django database environs sqlite, postgres ####
-DATABASE_ENVIRON=sqlite
+#### Django database environs sqlite3, postgres, mysql ####
+DATABASE_ENVIRON=sqlite3
 
 #### PostgreSQL configurations ####
-POSTGRES_NAME=POSTGRES_NAME
-POSTGRES_USER=POSTGRES_USER
-POSTGRES_PASSWORD=POSTGRES_PASSWORD
-POSTGRES_HOST=localhost
-POSTGRES_PORT=5432
+DATABASE_NAME=POSTGRES_NAME
+DATABASE_USER=POSTGRES_USER
+DATABASE_PASSWORD=POSTGRES_PASSWORD
+DATABASE_HOST=localhost
+DATABASE_PORT=5432
 
 
 #### Django Admin param ####

.github/workflows/django.yml

@@ -48,6 +48,9 @@ jobs:
         touch .env
         echo PRIVATE_KEY_PATH=$(pwd)/security/private_key.pem >> .env
         echo PUBLIC_KEY_PATH=$(pwd)/security/public_key.pem >> .env
+        DJANGO_SETTINGS_MODULE=core.settings.development >> .env
+        echo DATABASE_ENVIRON=sqlite3 >> .env
+
 
     - name: Check if .env has been updated
       run: cat .env  # This is a command, so it uses 'run'

README.md

@@ -65,11 +65,11 @@ PUBLIC_KEY_PATH=security_settings/public_key.pem # default
 DATABASE_ENVIRON=sqlite # sqlite or postgres
 
 # PostgreSQL configruations
-POSTGRES_NAME=<your database name>
-POSTGRES_USER=<your database user>
-POSTGRES_PASSWORD=<your database password>
-POSTGRES_HOST=localhost # default
-POSTGRES_PORT=5432 # default
+DATABASE_NAME=<your database name>
+DATABASE_USER=<your database user>
+DATABASE_PASSWORD=<your database password>
+DATABASE_HOST=localhost # default
+DATABASE_PORT=5432 # default
 
 ADMIN_USERNAME=admin # default
 ADMIN_PASSWORD=password # default

core/settings/base.py

@@ -54,14 +54,6 @@
 
 WSGI_APPLICATION = "core.wsgi.application"
 
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
-    }
-}
-
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",

core/settings/development.py

@@ -1,3 +1,12 @@
+import os
+
 from .base import * # noqa
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+
+DATABASES = {
+    "default": {
+        "ENGINE": f"django.db.backends.{str(os.getenv('DATABASE_ENVIRON'))}",
+        "NAME": BASE_DIR / "db.sqlite3",
+    }
+}

core/settings/production.py

@@ -11,12 +11,12 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql",
-        "NAME": str(os.getenv("POSTGRES_NAME")),
-        "USER": str(os.getenv("POSTGRES_USER")),
-        "PASSWORD": str(os.getenv("POSTGRES_PASSWORD")),
-        "HOST": str(os.getenv("POSTGRES_HOST")),
-        "PORT": int(os.getenv("POSTGRES_PORT"))
+        "ENGINE": f"django.db.backends.{str(os.getenv('DATABASE_ENVIRON'))}",
+        "NAME": str(os.getenv("DATABASE_NAME")),
+        "USER": str(os.getenv("DATABASE_USER")),
+        "PASSWORD": str(os.getenv("DATABASE_PASSWORD")),
+        "HOST": str(os.getenv("DATABASE_HOST")),
+        "PORT": int(os.getenv("DATABASE_PORT"))
     }
 }