Fix connections

Author: xmnlab

.env.tpl

@@ -9,8 +9,11 @@ POSTGRES_PORT=${POSTGRES_PORT}
 POSTGRES_USER=${POSTGRES_USER}
 POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
 POSTGRES_DB=${POSTGRES_DB}
-POSTGRES_DB_PRIVATE=${POSTGRES_DB_PRIVATE}
-POSTGRES_DB_SANDBOX=${POSTGRES_DB_SANDBOX}
+POSTGRES_EPIGRAPH_USER=${POSTGRES_EPIGRAPH_USER}
+POSTGRES_EPIGRAPH_PASSWORD=${POSTGRES_EPIGRAPH_PASSWORD}
+POSTGRES_EPIGRAPH_DB=${POSTGRES_EPIGRAPH_DB}
+POSTGRES_EPIGRAPH_DB_PRIVATE=${POSTGRES_DB_EPIGRAPH_PRIVATE}
+POSTGRES_EPIGRAPH_DB_SANDBOX=${POSTGRES_DB_EPIGRAPH_SANDBOX}
 RECAPTCHA_PUBLIC_KEY=${RECAPTCHA_PUBLIC_KEY}
 RECAPTCHA_PRIVATE_KEY=${RECAPTCHA_PRIVATE_KEY}
 REDIS_HOST=${REDIS_HOST}

.github/workflows/main.yaml

@@ -13,11 +13,14 @@ env:
   HOST_POSTGRES_DUMP: /tmp/dump
   POSTGRES_HOST: epigraphhub-db
   POSTGRES_PORT: 25432
-  POSTGRES_USER: dev_epigraph
-  POSTGRES_PASSWORD: dev_epigraph
-  POSTGRES_DB: dev_epigraphhub
-  POSTGRES_DB_PRIVATE: dev_privatehub
-  POSTGRES_DB_SANDBOX: dev_sandbox
+  POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: postgres
+  POSTGRES_DB: postgres
+  POSTGRES_EPIGRAPH_USER: dev_epigraph
+  POSTGRES_EPIGRAPH_PASSWORD: dev_epigraph
+  POSTGRES_EPIGRAPH_DB: dev_epigraphhub
+  POSTGRES_EPIGRAPH_DB_PRIVATE: dev_privatehub
+  POSTGRES_EPIGRAPH_DB_SANDBOX: dev_sandbox
   REDIS_HOST: epigraphhub-redis
   REDIS_PORT: 6379
   REDIS_PASSWORD: redispass

Data_Collection/CRON_scripts/config.py

@@ -8,10 +8,10 @@
 
 DB_HOST = os.environ.get("POSTGRES_HOST")
 DB_PORT = os.environ.get("POSTGRES_PORT")
-DB_USER = os.environ.get("POSTGRES_USER")
-DB_PASSWORD = os.environ.get("POSTGRES_PASSWORD")
-DB_NAME = os.environ.get("POSTGRES_DB")
-DB_NAME_PRIVATE = os.environ.get("POSTGRES_DB_PRIVATE")
+DB_USER = os.environ.get("POSTGRES_EPIGRAPH_USER")
+DB_PASSWORD = os.environ.get("POSTGRES_EPIGRAPH_PASSWORD")
+DB_NAME = os.environ.get("POSTGRES_EPIGRAPH_DB")
+DB_NAME_PRIVATE = os.environ.get("POSTGRES_EPIGRAPH_DB_PRIVATE")
 
 DB_URI = (
     f"postgresql://{DB_USER}:{DB_PASSWORD}"

docker/postgresql/prepare-db.sh

@@ -16,4 +16,4 @@ echo "[II] LOAD EPIGRAPHHUB DUMP"
 psql "${PSQL_CONNECTION}/${POSTGRES_DB}" < ${DOCKER_DIR}/sql/epigraphhub.sql
 
 echo "[II] LOAD PRIVATE DUMP"
-psql "${PSQL_CONNECTION}/$POSTGRES_DB_PRIVATE" < ${DOCKER_DIR}/sql/privatehub.sql
+psql "${PSQL_CONNECTION}/${POSTGRES_DB_PRIVATE}" < ${DOCKER_DIR}/sql/privatehub.sql