From 5066c9f9e262cffa7fe35be0f474ef0010206a9f Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:11:18 +0100
Subject: [PATCH] fix postiz

---
 templates/compose/postiz.yaml | 37 ++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/templates/compose/postiz.yaml b/templates/compose/postiz.yaml
index 01a61594f..34f268015 100644
--- a/templates/compose/postiz.yaml
+++ b/templates/compose/postiz.yaml
@@ -1,4 +1,3 @@
-# ignore: true
 # documentation: https://docs.postiz.com
 # slogan: Open source social media scheduling tool.
 # tags: post everywhere, social media, planning
@@ -13,10 +12,10 @@ services:
       - MAIN_URL=${SERVICE_FQDN_POSTIZ}
       - FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
       - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ}/api
-      - JWT_SECRET=${SERVICE_REALBASE64_JWTSECRET}
-      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-postiz}?schema=public
-      - REDIS_URL=redis://redis:6379
-      - BACKEND_INTERNAL_URL=http://localhost:3000/
+      - JWT_SECRET=${SERVICE_PASSWORD_JWTSECRET}
+      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRESQL}:${SERVICE_PASSWORD_POSTGRESQL}@postgresql:5432/${POSTGRESQL_DATABASE:-postiz-db}
+      - REDIS_URL=redis://${SERVICE_USER_REDIS}:${SERVICE_PASSWORD_REDIS}@redis:6379
+      - BACKEND_INTERNAL_URL=http://localhost:3000
       - IS_GENERAL=true
       - STORAGE_PROVIDER=local
       - UPLOAD_DIRECTORY=/uploads
@@ -54,12 +53,12 @@ services:
       - BEEHIIVE_PUBLICATION_ID=${SERVICE_BEEHIIVE_PUBID}
       - OPENAI_API_KEY=${SERVICE_OPENAI_KEY}
     volumes:
-      - postiz-config:/config/
-      - postiz-uploads:/uploads/
+      - postiz_config:/config/
+      - postiz_uploads:/uploads/
     depends_on:
-      postiz-postgres:
+      postgres:
         condition: service_healthy
-      postiz-redis:
+      redis:
         condition: service_healthy
     healthcheck:
       test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:5000/"]
@@ -67,19 +66,10 @@ services:
       timeout: 20s
       retries: 10
 
-  postiz-postgres:
+  postgres:
     image: postgres:14.5
     volumes:
-      - 'postiz_config:/config'
-      - 'postiz_uploads:/uploads'
-    healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:5000/"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
-  postgres:
-    image: "postgres:latest"
-      - postiz-postgresql-data:/var/lib/postgresql/data
+      - postiz_postgresql_data:/var/lib/postgresql/data
     environment:
       - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
@@ -90,10 +80,13 @@ services:
       timeout: 20s
       retries: 10
 
-  postiz-redis:
+  redis:
     image: redis:7.2
     volumes:
-      - postiz-redis-data:/data
+      - postiz_redis_data:/data
+    environment:
+      - REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}
+      - REDIS_USER=${SERVICE_USER_REDIS}
     healthcheck:
       test:
         - CMD