Configure PostgreSQL strictly and set tradhoxcrm database settings
This commit is contained in:
parent
6d7524bbe3
commit
398173d1b3
5 changed files with 41 additions and 27 deletions
23
.env.docker
23
.env.docker
|
|
@ -8,17 +8,22 @@ ENV_TYPE=dev
|
||||||
ALLOWED_HOSTS=localhost,127.0.0.1,backend
|
ALLOWED_HOSTS=localhost,127.0.0.1,backend
|
||||||
DOMAIN_NAME=http://localhost:8000
|
DOMAIN_NAME=http://localhost:8000
|
||||||
|
|
||||||
# Database (must match docker-compose db service)
|
# Database
|
||||||
DBNAME=crm_db
|
DB_NAME=tradhoxcrm
|
||||||
DBUSER=crm_user
|
DBNAME=tradhoxcrm
|
||||||
DBPASSWORD=crm_password
|
DB_USER=vignesh
|
||||||
DBHOST=db
|
DBUSER=vignesh
|
||||||
|
DB_PASSWORD=vignesh_secret_pass_2026
|
||||||
|
DBPASSWORD=vignesh_secret_pass_2026
|
||||||
|
DB_HOST=16.113.106.152
|
||||||
|
DBHOST=16.113.106.152
|
||||||
|
DB_PORT=5432
|
||||||
DBPORT=5432
|
DBPORT=5432
|
||||||
|
|
||||||
# Postgres superuser (used by db service to create the database)
|
# Postgres superuser (for postgres service if used)
|
||||||
POSTGRES_DB=crm_db
|
POSTGRES_DB=tradhoxcrm
|
||||||
POSTGRES_USER=postgres
|
POSTGRES_USER=vignesh
|
||||||
POSTGRES_PASSWORD=postgres_password
|
POSTGRES_PASSWORD=vignesh_secret_pass_2026
|
||||||
|
|
||||||
# Celery / Redis
|
# Celery / Redis
|
||||||
CELERY_BROKER_URL=redis://redis:6379/0
|
CELERY_BROKER_URL=redis://redis:6379/0
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,15 @@ AWS_SES_REGION_NAME=""
|
||||||
AWS_SES_REGION_ENDPOINT=""
|
AWS_SES_REGION_ENDPOINT=""
|
||||||
|
|
||||||
# DB
|
# DB
|
||||||
DBNAME="crm_db"
|
DB_HOST="16.113.106.152"
|
||||||
DBUSER="postgres"
|
DB_PORT="5432"
|
||||||
DBPASSWORD="postgres"
|
DB_USER="vignesh"
|
||||||
DBHOST="localhost"
|
DB_PASSWORD="vignesh_secret_pass_2026"
|
||||||
|
DB_NAME="tradhoxcrm"
|
||||||
|
DBNAME="tradhoxcrm"
|
||||||
|
DBUSER="vignesh"
|
||||||
|
DBPASSWORD="vignesh_secret_pass_2026"
|
||||||
|
DBHOST="16.113.106.152"
|
||||||
DBPORT="5432"
|
DBPORT="5432"
|
||||||
|
|
||||||
# Sentry (optional)
|
# Sentry (optional)
|
||||||
|
|
|
||||||
|
|
@ -163,11 +163,11 @@ DB_POOL_MAX_SIZE = int(os.environ.get("DB_POOL_MAX_SIZE", "10"))
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
"default": {
|
"default": {
|
||||||
"ENGINE": "django.db.backends.postgresql",
|
"ENGINE": "django.db.backends.postgresql",
|
||||||
"NAME": os.environ.get("DBNAME", "crm_db"),
|
"NAME": os.environ.get("DB_NAME", os.environ.get("DBNAME", "tradhoxcrm")),
|
||||||
"USER": os.environ.get("DBUSER", "postgres"),
|
"USER": os.environ.get("DB_USER", os.environ.get("DBUSER", "vignesh")),
|
||||||
"PASSWORD": os.environ.get("DBPASSWORD", "postgres"),
|
"PASSWORD": os.environ.get("DB_PASSWORD", os.environ.get("DBPASSWORD", "vignesh_secret_pass_2026")),
|
||||||
"HOST": os.environ.get("DBHOST", "localhost"),
|
"HOST": os.environ.get("DB_HOST", os.environ.get("DBHOST", "16.113.106.152")),
|
||||||
"PORT": os.environ.get("DBPORT", "5432"),
|
"PORT": int(os.environ.get("DB_PORT", os.environ.get("DBPORT", "5432"))),
|
||||||
# Django raises ImproperlyConfigured if this is non-zero alongside a
|
# Django raises ImproperlyConfigured if this is non-zero alongside a
|
||||||
# pool ("Pooling doesn't support persistent connections"). Keep it 0.
|
# pool ("Pooling doesn't support persistent connections"). Keep it 0.
|
||||||
"CONN_MAX_AGE": 0,
|
"CONN_MAX_AGE": 0,
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,20 @@
|
||||||
"""
|
"""
|
||||||
Test settings for Django CRM backend.
|
Test settings for Django CRM backend.
|
||||||
|
|
||||||
Uses SQLite in-memory database instead of PostgreSQL for fast, isolated tests.
|
Strictly PostgreSQL only.
|
||||||
RLS (Row-Level Security) is PostgreSQL-only and is skipped on SQLite.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from crm.settings import * # noqa: F401, F403
|
from crm.settings import * # noqa: F401, F403
|
||||||
|
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
"default": {
|
"default": {
|
||||||
"ENGINE": "django.db.backends.sqlite3",
|
"ENGINE": "django.db.backends.postgresql",
|
||||||
"NAME": ":memory:",
|
"NAME": os.environ.get("DB_NAME", os.environ.get("DBNAME", "tradhoxcrm")),
|
||||||
|
"USER": os.environ.get("DB_USER", os.environ.get("DBUSER", "vignesh")),
|
||||||
|
"PASSWORD": os.environ.get("DB_PASSWORD", os.environ.get("DBPASSWORD", "vignesh_secret_pass_2026")),
|
||||||
|
"HOST": os.environ.get("DB_HOST", os.environ.get("DBHOST", "16.113.106.152")),
|
||||||
|
"PORT": int(os.environ.get("DB_PORT", os.environ.get("DBPORT", "5432"))),
|
||||||
|
"CONN_MAX_AGE": 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,11 +35,11 @@ from crm.test_settings import * # noqa: F401, F403
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
"default": {
|
"default": {
|
||||||
"ENGINE": "django.db.backends.postgresql",
|
"ENGINE": "django.db.backends.postgresql",
|
||||||
"NAME": os.environ.get("DBNAME", "crm_db"),
|
"NAME": os.environ.get("DB_NAME", os.environ.get("DBNAME", "tradhoxcrm")),
|
||||||
"USER": os.environ.get("DBUSER", "postgres"),
|
"USER": os.environ.get("DB_USER", os.environ.get("DBUSER", "vignesh")),
|
||||||
"PASSWORD": os.environ.get("DBPASSWORD", "postgres"),
|
"PASSWORD": os.environ.get("DB_PASSWORD", os.environ.get("DBPASSWORD", "vignesh_secret_pass_2026")),
|
||||||
"HOST": os.environ.get("DBHOST", "localhost"),
|
"HOST": os.environ.get("DB_HOST", os.environ.get("DBHOST", "16.113.106.152")),
|
||||||
"PORT": os.environ.get("DBPORT", "5432"),
|
"PORT": int(os.environ.get("DB_PORT", os.environ.get("DBPORT", "5432"))),
|
||||||
"CONN_MAX_AGE": 0,
|
"CONN_MAX_AGE": 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue