From 3cd2a13244ab0c887a72fdb5df878fa63f4fab07 Mon Sep 17 00:00:00 2001
From: Yhael S <yhaelopez@gmail.com>
Date: Fri, 20 Oct 2023 02:24:28 -0500
Subject: [PATCH] fix

---
 .env.example           |  2 ++
 postgres/entrypoint.sh | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index e22217d..a49a584 100644
--- a/.env.example
+++ b/.env.example
@@ -19,6 +19,7 @@ SERVICES=odoo,nginx,proxy,postgres
 USE_REDIS=false
 USE_S3=false
 USE_SENTRY=false
+USE_PGADMIN=false
 
 # Enterprise
 GITHUB_USER=
@@ -127,6 +128,7 @@ SUPPORT_EMAIL=mail@example.com
 USE_REDIS=${USE_REDIS}
 USE_S3=${USE_S3}
 USE_SENTRY=${USE_SENTRY}
+USE_PGADMIN=${USE_PGADMIN}
 
 # Which services are going to be brought up
 COMPOSE_PROFILES=${SERVICES}
diff --git a/postgres/entrypoint.sh b/postgres/entrypoint.sh
index b232538..35a1b35 100755
--- a/postgres/entrypoint.sh
+++ b/postgres/entrypoint.sh
@@ -20,13 +20,15 @@ psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "ALTER USER $DB
 psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "GRANT ALL PRIVILEGES ON DATABASE $DB_TEMPLATE TO $DB_USER;"
 psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $DB_TEMPLATE -c "ALTER DATABASE $DB_TEMPLATE OWNER TO $DB_USER;"
 
-# Create PgAdmin user and give proper privileges
-psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "CREATE DATABASE $PGADMING_DB_NAME;"
-psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "CREATE USER $PGADMING_DB_USER WITH PASSWORD '$PGADMIN_DB_PASSWORD';"
-psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "GRANT ALL PRIVILEGES ON DATABASE $PGADMING_DB_NAME TO $PGADMING_DB_USER;"
-psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $PGADMING_DB_NAME -c "GRANT ALL PRIVILEGES ON SCHEMA public TO $PGADMING_DB_USER;"
-
-# Revoke Odoo user's access to pgadmin database
-psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "REVOKE CONNECT ON DATABASE $PGADMING_DB_NAME FROM $DB_USER;"
+# Check the USE_REDIS to add sentry to LOAD variable
+if [[ $USE_PGADMIN == "true" ]]; then
+    # Create PgAdmin user and give proper privileges
+    psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "CREATE DATABASE $PGADMING_DB_NAME;"
+    psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "CREATE USER $PGADMING_DB_USER WITH PASSWORD '$PGADMIN_DB_PASSWORD';"
+    psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "GRANT ALL PRIVILEGES ON DATABASE $PGADMING_DB_NAME TO $PGADMING_DB_USER;"
+    psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $PGADMING_DB_NAME -c "GRANT ALL PRIVILEGES ON SCHEMA public TO $PGADMING_DB_USER;"
+    # Revoke Odoo user's access to pgadmin database
+    psql -p $POSTGRES_PORT -U $POSTGRES_MAIN_USER -d $POSTGRES_DB -c "REVOKE CONNECT ON DATABASE $PGADMING_DB_NAME FROM $DB_USER;"
+fi
 
 echo "Setup completed."