update templates

twenty/code/.env.example

@@ -4,13 +4,13 @@ TAG=latest
 #PG_DATABASE_PASSWORD=replace_me_with_a_strong_password_without_special_characters
 #PG_DATABASE_HOST=db
 #PG_DATABASE_PORT=5432
-#REDIS_URL=redis://redis:6379
+REDIS_URL=redis://redis:6379
 
-SERVER_URL=http://localhost:3000
+SERVER_URL=https://$(PRIMARY_DOMAIN)
 SIGN_IN_PREFILLED=false
 
 # Use openssl rand -base64 32 for each secret
-# APP_SECRET=replace_me_with_a_random_string
+APP_SECRET=replace_me_with_a_random_string
 
 STORAGE_TYPE=local
 

twenty/code/docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
       - docker-data:/app/docker-data
     environment:
-      PORT: 3000
+      NODE_PORT: 3000
       PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
       SERVER_URL: ${SERVER_URL}
       REDIS_URL: ${REDIS_URL:-redis://redis:6379}

twenty/code/k8s/manifests/deployment-server.yaml

@@ -33,7 +33,7 @@ spec:
           image: twentycrm/twenty:latest
           imagePullPolicy: Always
           env:
-            - name: PORT
+            - name: NODE_PORT
               value: 3000
             - name: SERVER_URL
               value: "https://crm.example.com:443"
@@ -45,8 +45,6 @@ spec:
               value: "false"
             - name: STORAGE_TYPE
               value: "local"
-            - name: "MESSAGE_QUEUE_TYPE"
-              value: "bull-mq"
             - name: "ACCESS_TOKEN_EXPIRES_IN"
               value: "7d"
             - name: "LOGIN_TOKEN_EXPIRES_IN"

twenty/code/k8s/manifests/deployment-worker.yaml

@@ -34,10 +34,6 @@ spec:
               value: "false" # it already runs on the server
             - name: STORAGE_TYPE
               value: "local"
-            - name: "MESSAGE_QUEUE_TYPE"
-              value: "bull-mq"
-            - name: "CACHE_STORAGE_TYPE"
-              value: "redis"
             - name: "REDIS_URL"
               value: "redis://twentycrm-redis.twentycrm.svc.cluster.local:6379"
             - name: APP_SECRET

twenty/code/k8s/terraform/deployment-server.tf

@@ -38,13 +38,9 @@ resource "kubernetes_deployment" "twentycrm_server" {
           tty   = true
 
           env {
-            name  = "PORT"
+            name  = "NODE_PORT"
             value = "3000"
           }
-          # env {
-          #   name  = "DEBUG_MODE"
-          #   value = false
-          # }
 
           env {
             name  = "SERVER_URL"
@@ -68,10 +64,6 @@ resource "kubernetes_deployment" "twentycrm_server" {
             name  = "STORAGE_TYPE"
             value = "local"
           }
-          env {
-            name  = "MESSAGE_QUEUE_TYPE"
-            value = "bull-mq"
-          }
           env {
             name  = "ACCESS_TOKEN_EXPIRES_IN"
             value = "7d"

twenty/code/k8s/terraform/deployment-worker.tf

@@ -48,11 +48,6 @@ resource "kubernetes_deployment" "twentycrm_worker" {
             value = "postgres://twenty:${var.twentycrm_pgdb_admin_password}@${kubernetes_service.twentycrm_db.metadata.0.name}.${kubernetes_namespace.twentycrm.metadata.0.name}.svc.cluster.local/default"
           }
 
-          env {
-            name  = "CACHE_STORAGE_TYPE"
-            value = "redis"
-          }
-
           env {
             name  = "REDIS_URL"
             value = "redis://${kubernetes_service.twentycrm_redis.metadata.0.name}.${kubernetes_namespace.twentycrm.metadata.0.name}.svc.cluster.local:6379"
@@ -67,10 +62,6 @@ resource "kubernetes_deployment" "twentycrm_worker" {
             name  = "STORAGE_TYPE"
             value = "local"
           }
-          env {
-            name  = "MESSAGE_QUEUE_TYPE"
-            value = "bull-mq"
-          }
 
           env {
             name = "APP_SECRET"