From fe66cf2fafb5a5e0c8c7b76c239d5344ab56344a Mon Sep 17 00:00:00 2001
From: Rindy Tuy <80165041+Rinzyy@users.noreply.github.com>
Date: Sat, 9 Nov 2024 01:49:28 -0600
Subject: [PATCH 1/2] Update twenty.yaml

fix running (starting) for Twenty
---
 templates/compose/twenty.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/compose/twenty.yaml b/templates/compose/twenty.yaml
index 8770798fd..fe350248f 100644
--- a/templates/compose/twenty.yaml
+++ b/templates/compose/twenty.yaml
@@ -15,6 +15,9 @@ services:
       - CACHE_STORAGE_TYPE=${CACHE_STORAGE_TYPE:-redis}
       - REDIS_HOST=redis
       - REDIS_PORT=6379
+      
+      # https://twenty.com/developers/section/self-hosting/docker-compose
+      - APP_SECRET=$SERVICE_BASE64_32_SECRET
 
       # https://twenty.com/developers/section/self-hosting/self-hosting-var#security
       - API_RATE_LIMITING_TTL=${API_RATE_LIMITING_TTL:-100}

From ed952f31b3c8a3a418720b997f134505b51765cf Mon Sep 17 00:00:00 2001
From: Rindy Tuy <80165041+Rinzyy@users.noreply.github.com>
Date: Sat, 9 Nov 2024 01:58:52 -0600
Subject: [PATCH 2/2] Update twenty.yaml

---
 templates/compose/twenty.yaml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/templates/compose/twenty.yaml b/templates/compose/twenty.yaml
index fe350248f..44ee1f6d6 100644
--- a/templates/compose/twenty.yaml
+++ b/templates/compose/twenty.yaml
@@ -13,21 +13,14 @@ services:
       - FRONT_BASE_URL=$SERVICE_FQDN_TWENTY
       - ENABLE_DB_MIGRATIONS=true
       - CACHE_STORAGE_TYPE=${CACHE_STORAGE_TYPE:-redis}
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-      
-      # https://twenty.com/developers/section/self-hosting/docker-compose
-      - APP_SECRET=$SERVICE_BASE64_32_SECRET
-
+      - REDIS_URL=redis://redis:6379
+  
       # https://twenty.com/developers/section/self-hosting/self-hosting-var#security
       - API_RATE_LIMITING_TTL=${API_RATE_LIMITING_TTL:-100}
       - API_RATE_LIMITING_LIMIT=${API_RATE_LIMITING_LIMIT:-100}
 
       # https://twenty.com/developers/section/self-hosting/self-hosting-var#tokens
-      - ACCESS_TOKEN_SECRET=$SERVICE_BASE64_32_ACCESS
-      - LOGIN_TOKEN_SECRET=$SERVICE_BASE64_32_LOGIN
-      - REFRESH_TOKEN_SECRET=$SERVICE_BASE64_32_REFRESH
-      - FILE_TOKEN_SECRET=$SERVICE_BASE64_32_FILE
+      - APP_SECRET=$SERVICE_BASE64_32_SECRET
       - POSTGRES_ADMIN_PASSWORD=$SERVICE_PASSWORD_POSTGRES
       - PG_DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@postgres:5432/default