From b16791dd7a99e48a0b645c26c9b080cb0daa4335 Mon Sep 17 00:00:00 2001
From: Ahson Shaikh <devops@progmatec.co>
Date: Sat, 9 Nov 2024 16:04:56 +0500
Subject: [PATCH] Twenty template fixed and updated to v0.32.3

---
 twenty/code/.env.example       | 25 +++++++++++++++++--------
 twenty/code/docker-compose.yml | 28 +++++++++++++++++++---------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/twenty/code/.env.example b/twenty/code/.env.example
index f5f762e..afc3806 100644
--- a/twenty/code/.env.example
+++ b/twenty/code/.env.example
@@ -1,23 +1,32 @@
-TAG=latest
+TAG=v0.32.3
 
 POSTGRES_ADMIN_PASSWORD=replace_me_with_a_strong_password
 
 PG_DATABASE_HOST=db:5432
+REDIS_URL=redis://redis:6379
 
-SERVER_URL=http://localhost:3000
+SERVER_URL=https://$(PRIMARY_DOMAIN)
 
-# Use openssl rand -base64 32 for each secret
-ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
-LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
-REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
-FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
+# Use openssl rand -base64 32 for each secret - Please change these values
+REFRESH_TOKEN_SECRET=IqPjqg9jCkrwp2KLS8k8mYRaOhvGtw3xmYF2dAkrkD0=
+ACCESS_TOKEN_SECRET=IqPjqg9jCkrwp2KLS8k8mYRaOhvGtw3xmYF2dAkrkD0=
+LOGIN_TOKEN_SECRET=IqPjqg9jCkrwp2KLS8k8mYRaOhvGtw3xmYF2dAkrkD0=
+APP_SECRET=IqPjqg9jCkrwp2KLS8k8mYRaOhvGtw3xmYF2dAkrkD0=
 
 SIGN_IN_PREFILLED=true
 
 STORAGE_TYPE=local
 
+#S3 STORAGE
 # STORAGE_S3_REGION=eu-west3
 # STORAGE_S3_NAME=my-bucket
 # STORAGE_S3_ENDPOINT=
 
-MESSAGE_QUEUE_TYPE=pg-boss
+
+#GOOGLE AUTH
+# AUTH_GOOGLE_ENABLED=true
+# AUTH_GOOGLE_CLIENT_ID=
+# AUTH_GOOGLE_CLIENT_SECRET=
+# AUTH_GOOGLE_CALLBACK_URL=
+# AUTH_GOOGLE_APIS_CALLBACK_URL=
+ 
\ No newline at end of file
diff --git a/twenty/code/docker-compose.yml b/twenty/code/docker-compose.yml
index 0e89be7..8b2c806 100644
--- a/twenty/code/docker-compose.yml
+++ b/twenty/code/docker-compose.yml
@@ -18,15 +18,15 @@ services:
     volumes:
       - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
       - docker-data:/app/docker-data
-    # ports:
-    #   - "3000:3000"
+    ports:
+      - "3000"
     environment:
       PORT: 3000
       PG_DATABASE_URL: postgres://twenty:twenty@${PG_DATABASE_HOST}/default
       SERVER_URL: ${SERVER_URL}
       FRONT_BASE_URL: ${FRONT_BASE_URL:-$SERVER_URL}
-      MESSAGE_QUEUE_TYPE: ${MESSAGE_QUEUE_TYPE}
-
+      REDIS_URL: ${REDIS_URL:-redis://localhost:6379}
+      REDIS_HOST: ${REDIS_HOST}
       ENABLE_DB_MIGRATIONS: "true"
 
       SIGN_IN_PREFILLED: ${SIGN_IN_PREFILLED}
@@ -34,10 +34,12 @@ services:
       STORAGE_S3_REGION: ${STORAGE_S3_REGION}
       STORAGE_S3_NAME: ${STORAGE_S3_NAME}
       STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
+     
       ACCESS_TOKEN_SECRET: ${ACCESS_TOKEN_SECRET}
       LOGIN_TOKEN_SECRET: ${LOGIN_TOKEN_SECRET}
       REFRESH_TOKEN_SECRET: ${REFRESH_TOKEN_SECRET}
-      FILE_TOKEN_SECRET: ${FILE_TOKEN_SECRET}
+      APP_SECRET: ${APP_SECRET}
+    
     depends_on:
       change-vol-ownership:
         condition: service_completed_successfully
@@ -57,18 +59,20 @@ services:
       PG_DATABASE_URL: postgres://twenty:twenty@${PG_DATABASE_HOST}/default
       SERVER_URL: ${SERVER_URL}
       FRONT_BASE_URL: ${FRONT_BASE_URL:-$SERVER_URL}
-      MESSAGE_QUEUE_TYPE: ${MESSAGE_QUEUE_TYPE}
-
+      REDIS_URL: ${REDIS_URL:-redis://localhost:6379}
+      REDIS_HOST: redis
       ENABLE_DB_MIGRATIONS: "false" # it already runs on the server
 
       STORAGE_TYPE: ${STORAGE_TYPE}
       STORAGE_S3_REGION: ${STORAGE_S3_REGION}
       STORAGE_S3_NAME: ${STORAGE_S3_NAME}
       STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
+
       ACCESS_TOKEN_SECRET: ${ACCESS_TOKEN_SECRET}
       LOGIN_TOKEN_SECRET: ${LOGIN_TOKEN_SECRET}
       REFRESH_TOKEN_SECRET: ${REFRESH_TOKEN_SECRET}
-      FILE_TOKEN_SECRET: ${FILE_TOKEN_SECRET}
+      APP_SECRET: ${APP_SECRET}
+
     depends_on:
       db:
         condition: service_healthy
@@ -89,7 +93,13 @@ services:
       retries: 10
     restart: always
 
+  redis:
+    image: redis
+    ports:
+      - "6379:6379"
+    restart: always
+
 volumes:
   docker-data:
   db-data:
-  server-local-data:
+  server-local-data:
\ No newline at end of file