fixed rabbitmq vhost issue

makeplane · Aug 22, 2024 · bb592b5 · bb592b5
1 parent d43c4fa
commit bb592b5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/.env.example b/.env.example
@@ -13,7 +13,7 @@ RABBITMQ_HOST="plane-mq"
 RABBITMQ_PORT="5672"
 RABBITMQ_USER="guest"
 RABBITMQ_PASSWORD="guest"
-RABBITMQ_VHOST="plane"
+RABBITMQ_DEFAULT_VHOST="plane"
 
 # AWS Settings
 AWS_REGION=""

diff --git a/deploy/selfhost/docker-compose.yml b/deploy/selfhost/docker-compose.yml
@@ -21,6 +21,13 @@ x-app-env: &app-env
     - REDIS_HOST=${REDIS_HOST:-plane-redis}
     - REDIS_PORT=${REDIS_PORT:-6379}
     - REDIS_URL=${REDIS_URL:-redis://plane-redis:6379/}
+
+    # RabbitMQ Settings
+    - RABBITMQ_HOST=${RABBITMQ_HOST:-plane-mq}
+    - RABBITMQ_PORT=${RABBITMQ_PORT:-5672}
+    - RABBITMQ_DEFAULT_USER=${RABBITMQ_USER:-guest}
+    - RABBITMQ_DEFAULT_PASSWORD=${RABBITMQ_PASSWORD:-guest}
+    - RABBITMQ_DEFAULT_VHOST=${RABBITMQ_DEFAULT_VHOST:-plane}
     # Application secret
     - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
     # DATA STORE SETTINGS
@@ -153,6 +160,13 @@ services:
     volumes:
       - redisdata:/data
 
+  plane-mq:
+    <<: *app-env
+    image: rabbitmq:3.13.6-management-alpine
+    restart: always
+    volumes:
+      - rabbitmqdata:/var/lib/rabbitmq
+
   plane-minio:
     <<: *app-env
     image: minio/minio:latest
@@ -179,6 +193,7 @@ services:
 volumes:
   pgdata:
   redisdata:
+  rabbitmqdata:
   uploads:
   logs_api:
   logs_worker:

diff --git a/deploy/selfhost/variables.env b/deploy/selfhost/variables.env
@@ -28,6 +28,13 @@ REDIS_HOST=plane-redis
 REDIS_PORT=6379
 REDIS_URL=
 
+# RabbitMQ Settings
+RABBITMQ_HOST="plane-mq"
+RABBITMQ_PORT="5672"
+RABBITMQ_USER="guest"
+RABBITMQ_PASSWORD="guest"
+RABBITMQ_DEFAULT_VHOST="plane"
+
 # Secret Key
 SECRET_KEY=60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -125,9 +125,12 @@ services:
     container_name: plane-mq
     image: rabbitmq:3.13.6-management-alpine
     restart: always
+    env_file:
+      - .env
     environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS}
+      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
+      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_DEFAULT_VHOST}
     volumes:
       - rabbitmqdata:/var/lib/rabbitmq