From 33dfea6ca7d0d142c67636ad3d0011fe672b9e9c Mon Sep 17 00:00:00 2001 From: Bruno Frank Silva Cordeiro Date: Fri, 12 Jun 2026 08:59:45 -0300 Subject: [PATCH] Wrapping up, everythings working. --- blueprints/evolutioncrm/docker-compose.yml | 17 ++++++++--------- blueprints/evolutioncrm/template.toml | 15 ++++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/blueprints/evolutioncrm/docker-compose.yml b/blueprints/evolutioncrm/docker-compose.yml index bc991313..ab1da2d5 100644 --- a/blueprints/evolutioncrm/docker-compose.yml +++ b/blueprints/evolutioncrm/docker-compose.yml @@ -26,7 +26,7 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - - REDIS_URL=${REDIS_URL} + - REDIS_URL=redis://redis:6379/3 - FRONTEND_URL=${FRONT_URL} - BACKEND_URL=${BACK_URL} - CORS_ORIGINS=${FRONT_URL},${BACK_URL} @@ -55,7 +55,7 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - - REDIS_URL=${REDIS_URL} + - REDIS_URL=redis://redis:6379/3 - DOORKEEPER_JWT_SECRET_KEY=${DOORKEEPER_JWT_SECRET_KEY} - DOORKEEPER_JWT_ALGORITHM=${DOORKEEPER_JWT_ALGORITHM} - DOORKEEPER_JWT_ISS=${DOORKEEPER_JWT_ISS} @@ -86,7 +86,7 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - - REDIS_URL=${REDIS_URL} + - REDIS_URL=redis://redis:6379/3 - EVO_AUTH_SERVICE_URL=http://evo-auth:3001 - EVO_AI_CORE_SERVICE_URL=http://evo-core:5555 - BACKEND_URL=${BACK_URL} @@ -122,7 +122,7 @@ services: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - - REDIS_URL=${REDIS_URL} + - REDIS_URL=redis://redis:6379/3 - EVO_AUTH_SERVICE_URL=${AUTH_URL} - EVO_AI_CORE_SERVICE_URL=http://evo-core:5555 - BACKEND_URL=${BACK_URL} @@ -174,7 +174,6 @@ services: - POSTGRES_CONNECTION_STRING=postgresql://postgres:${POSTGRES_PASSWORD}@postgres:5432/evo_crm_production - REDIS_HOST=redis - REDIS_PORT=6379 - - REDIS_PASSWORD=${REDIS_PASSWORD} - REDIS_SSL=false - REDIS_DB=3 - REDIS_KEY_PREFIX="a2a:" @@ -188,7 +187,7 @@ services: - EVO_AI_CRM_URL=http://evo-crm:3000 - CORE_SERVICE_URL=http://evo-core:5555/api/v1 - EVO_AUTH_BASE_URL=http://evo-auth:3001 - - APP_URL=${PROCESSOR_URL} + - APP_URL=${FRONT_URL} - API_URL=${PROCESSOR_URL} - API_TITLE=Agent Processor Community - API_DESCRIPTION=Agent Processor Community for Evolution AI @@ -212,9 +211,9 @@ services: - VITE_APP_ENV=production - VITE_API_URL=${BACK_URL} - VITE_AUTH_API_URL=${AUTH_URL} - - VITE_EVOAI_API_URL=${PROCESSOR_URL} + - VITE_EVOAI_API_URL=${EVOIA_URL} - VITE_AGENT_PROCESSOR_URL=${PROCESSOR_URL} - - VITE_WS_URL=wss://${BACK_URL} + - VITE_WS_URL=wss://${BACK_DOMAIN} - VITE_FRONT_URL=${FRONT_URL} postgres: @@ -239,7 +238,7 @@ services: volumes: - redis-data:/data healthcheck: - test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"] + test: ["CMD-SHELL", "redis-cli ping"] interval: 5s timeout: 5s retries: 10 diff --git a/blueprints/evolutioncrm/template.toml b/blueprints/evolutioncrm/template.toml index 2cabfd9f..90a6c36d 100644 --- a/blueprints/evolutioncrm/template.toml +++ b/blueprints/evolutioncrm/template.toml @@ -2,12 +2,12 @@ auth_domain = "${domain}" front_domain = "${domain}" api_domain = "${domain}" +evoia_domain = "${domain}" processor_domain = "${domain}" postgres_password = "${password}" secret_key_base = "${base64:64}" jwt_secret_key = "${base64:64}" api_token = "${base64:64}" -redis_password = "${password}" doorkeeper_jwt_secret_key = "${base64:64}" bot_runtime_secret = "${base64:64}" encryption_key = "${base64:32}" @@ -22,16 +22,17 @@ env = [ "POSTGRES_PASSWORD=${postgres_password}", "POSTGRES_DATABASE=evo_crm_community", "POSTGRES_USERNAME=postgres", - "REDIS_URL=redis://:${redis_password}@redis:6379/3", - "REDIS_PASSWORD=${redis_password}", + "REDIS_URL=redis://redis:6379/3", "FRONT_DOMAIN=${front_domain}", - "FRONT_URL=http://${front_domain}", + "FRONT_URL=\"http://${front_domain}\"", "BACK_DOMAIN=${api_domain}", - "BACK_URL=http://${api_domain}", + "BACK_URL=\"http://${api_domain}\"", "AUTH_DOMAIN=${auth_domain}", - "AUTH_URL=http://${auth_domain}", + "AUTH_URL=\"http://${auth_domain}\"", "PROCESSOR_DOMAIN=${processor_domain}", - "PROCESSOR_URL=http://${processor_domain}", + "PROCESSOR_URL=\"http://${processor_domain}\"", + "EVOIA_DOMAIN=${evoia_domain}", + "EVOIA_URL=\"http://${evoia_domain}\"", "DOORKEEPER_JWT_SECRET_KEY=${doorkeeper_jwt_secret_key}", "DOORKEEPER_JWT_ALGORITHM=hs256", "DOORKEEPER_JWT_ISS=evo-auth-service",