diff --git a/.env.docker b/.env.docker index 1de3bcb2..eabe7ef7 100644 --- a/.env.docker +++ b/.env.docker @@ -8,17 +8,22 @@ ENV_TYPE=dev ALLOWED_HOSTS=localhost,127.0.0.1,backend DOMAIN_NAME=http://localhost:8000 -# Database (must match docker-compose db service) -DBNAME=crm_db -DBUSER=crm_user -DBPASSWORD=crm_password -DBHOST=db +# Database +DB_NAME=tradhoxcrm +DBNAME=tradhoxcrm +DB_USER=vignesh +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 -# Postgres superuser (used by db service to create the database) -POSTGRES_DB=crm_db -POSTGRES_USER=postgres -POSTGRES_PASSWORD=postgres_password +# Postgres superuser (for postgres service if used) +POSTGRES_DB=tradhoxcrm +POSTGRES_USER=vignesh +POSTGRES_PASSWORD=vignesh_secret_pass_2026 # Celery / Redis CELERY_BROKER_URL=redis://redis:6379/0 diff --git a/backend/.env.example b/backend/.env.example index 0cbe2b72..4fc590dd 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -21,10 +21,15 @@ AWS_SES_REGION_NAME="" AWS_SES_REGION_ENDPOINT="" # DB -DBNAME="crm_db" -DBUSER="postgres" -DBPASSWORD="postgres" -DBHOST="localhost" +DB_HOST="16.113.106.152" +DB_PORT="5432" +DB_USER="vignesh" +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" # Sentry (optional) diff --git a/backend/crm/settings.py b/backend/crm/settings.py index 449e4ce3..4e37f8e8 100644 --- a/backend/crm/settings.py +++ b/backend/crm/settings.py @@ -163,11 +163,11 @@ DB_POOL_MAX_SIZE = int(os.environ.get("DB_POOL_MAX_SIZE", "10")) DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", - "NAME": os.environ.get("DBNAME", "crm_db"), - "USER": os.environ.get("DBUSER", "postgres"), - "PASSWORD": os.environ.get("DBPASSWORD", "postgres"), - "HOST": os.environ.get("DBHOST", "localhost"), - "PORT": os.environ.get("DBPORT", "5432"), + "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"))), # Django raises ImproperlyConfigured if this is non-zero alongside a # pool ("Pooling doesn't support persistent connections"). Keep it 0. "CONN_MAX_AGE": 0, diff --git a/backend/crm/test_settings.py b/backend/crm/test_settings.py index 42e3fd6b..554b3623 100644 --- a/backend/crm/test_settings.py +++ b/backend/crm/test_settings.py @@ -1,16 +1,20 @@ """ Test settings for Django CRM backend. -Uses SQLite in-memory database instead of PostgreSQL for fast, isolated tests. -RLS (Row-Level Security) is PostgreSQL-only and is skipped on SQLite. +Strictly PostgreSQL only. """ from crm.settings import * # noqa: F401, F403 DATABASES = { "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": ":memory:", + "ENGINE": "django.db.backends.postgresql", + "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, } } diff --git a/backend/crm/test_settings_postgres.py b/backend/crm/test_settings_postgres.py index 886de6f0..86438e1b 100644 --- a/backend/crm/test_settings_postgres.py +++ b/backend/crm/test_settings_postgres.py @@ -35,11 +35,11 @@ from crm.test_settings import * # noqa: F401, F403 DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", - "NAME": os.environ.get("DBNAME", "crm_db"), - "USER": os.environ.get("DBUSER", "postgres"), - "PASSWORD": os.environ.get("DBPASSWORD", "postgres"), - "HOST": os.environ.get("DBHOST", "localhost"), - "PORT": os.environ.get("DBPORT", "5432"), + "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, } }