From 77de9c17b877149b14d4fb0560f6ddd61fb61835 Mon Sep 17 00:00:00 2001
From: bijan <bijan@bitium.agency>
Date: Mon, 13 May 2024 17:22:55 +0330
Subject: [PATCH] fix: revert user and pass config for databse changes

---
 .env                          | 4 +++-
 config/database.ts            | 4 ++--
 docker-compose.production.yml | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 3f544a3..81d3346 100644
--- a/.env
+++ b/.env
@@ -6,8 +6,10 @@ ADMIN_JWT_SECRET=LF5chfbB28oDcAo0/4jDgw==
 TRANSFER_TOKEN_SALT=K0DmE/5Z8WMe68Siq2IYsQ==
 # Database
 DATABASE_CLIENT=postgres
-DATABASE_HOST=contactus_db
+DATABASE_HOST=contactusDB
 DATABASE_PORT=5432
 DATABASE_NAME=contactus
+DATABASE_USERNAME=bitium_contactus
+DATABASE_PASSWORD=bitium_contactus
 DATABASE_SSL=false
 NODE_ENV=production
diff --git a/config/database.ts b/config/database.ts
index 12fcd76..627e05a 100644
--- a/config/database.ts
+++ b/config/database.ts
@@ -53,8 +53,8 @@ export default ({ env }) => {
         host: env('DATABASE_HOST', 'localhost'),
         port: env.int('DATABASE_PORT', 5432),
         database: env('DATABASE_NAME', 'strapi'),
-        // user: env('DATABASE_USERNAME', 'strapi'),
-        // password: env('DATABASE_PASSWORD', 'strapi'),
+        user: env('DATABASE_USERNAME', 'strapi'),
+        password: env('DATABASE_PASSWORD', 'strapi'),
         ssl: false,
         schema: env('DATABASE_SCHEMA', 'public'),
       },
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 37203f0..3770165 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -11,6 +11,8 @@ services:
       DATABASE_HOST: ${DATABASE_HOST}
       DATABASE_PORT: ${DATABASE_PORT}
       DATABASE_NAME: ${DATABASE_NAME}
+      DATABASE_USERNAME: ${DATABASE_USERNAME}
+      DATABASE_PASSWORD: ${DATABASE_PASSWORD}
       JWT_SECRET: ${JWT_SECRET}
       ADMIN_JWT_SECRET: ${ADMIN_JWT_SECRET}
       APP_KEYS: ${APP_KEYS}
@@ -35,6 +37,8 @@ services:
     env_file: .env
     image: postgres:12.0-alpine
     environment:
+      POSTGRES_USER: ${DATABASE_USERNAME}
+      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
       POSTGRES_DB: ${DATABASE_NAME}
     volumes:
       - contactus-data:/var/lib/postgresql/data/ #using a volume