From 13637e42f5154cd3301bf7c707c9355d551b808a Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Tue, 30 Aug 2022 22:58:11 +0300
Subject: [PATCH] sprint

---
 .deploy/deploy-dev.yaml          | 9 +++++++--
 .deploy/deploy-prod.yaml         | 9 +++++++--
 nginx/nginx-dev/nginx-dev.conf   | 4 ++--
 nginx/nginx-prod/nginx-prod.conf | 4 ++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index 847c7e3..e708559 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -6,6 +6,7 @@ services:
     ports:
       - "80:80"
     networks:
+      - infra-net
       - battleship-nginx
       - sprint-nginx
     deploy:
@@ -40,8 +41,9 @@ services:
   rabbitmq:
     image: rabbitmq:3.7.9-management
     ports:
-      - "15672:15672"
       - "5672:5672"
+    networks:
+      - infra-net
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
     deploy:
@@ -89,9 +91,10 @@ services:
     environment:
       MINIO_ROOT_USER: minioadmin
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV
+    networks:
+      - infra-net
     ports:
       - "9000:9000"
-      - "9001:9001"
     deploy:
       mode: replicated
       placement:
@@ -107,6 +110,8 @@ volumes:
     driver: local
 
 networks:
+  infra-net:
+    driver: overlay
   battleship-nginx:
     external: true
   sprint-nginx:
diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml
index 7239369..942c819 100644
--- a/.deploy/deploy-prod.yaml
+++ b/.deploy/deploy-prod.yaml
@@ -6,6 +6,7 @@ services:
     ports:
       - "80:80"
     networks:
+      - infra-net
       - battleship-nginx
       - sprint-nginx
     deploy:
@@ -40,8 +41,9 @@ services:
   rabbitmq:
     image: rabbitmq:3.7.9-management
     ports:
-      - "15672:15672"
       - "5672:5672"
+    networks:
+      - infra-net
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD
     deploy:
@@ -91,7 +93,8 @@ services:
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD
     ports:
       - "9000:9000"
-      - "9001:9001"
+    networks:
+      - infra-net
     deploy:
       mode: replicated
       placement:
@@ -107,6 +110,8 @@ volumes:
     driver: local
 
 networks:
+  infra-net:
+    driver: overlay
   battleship-nginx:
     external: true
   sprint-nginx:
diff --git a/nginx/nginx-dev/nginx-dev.conf b/nginx/nginx-dev/nginx-dev.conf
index 9951807..952287b 100644
--- a/nginx/nginx-dev/nginx-dev.conf
+++ b/nginx/nginx-dev/nginx-dev.conf
@@ -26,7 +26,7 @@ http {
         server_name rabbitmq.develop.sprinthub.ru;
 
         location / {
-            proxy_pass http://dev.develop.sprinthub.ru:15672/;
+            proxy_pass http://rabbtimq:15672/;
         }
     }
 
@@ -35,7 +35,7 @@ http {
         server_name minio.develop.sprinthub.ru;
 
         location / {
-            proxy_pass http://dev.develop.sprinthub.ru:9001/;
+            proxy_pass http://minio:9001/;
         }
     }
 
diff --git a/nginx/nginx-prod/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf
index a47bd51..7fbf965 100644
--- a/nginx/nginx-prod/nginx-prod.conf
+++ b/nginx/nginx-prod/nginx-prod.conf
@@ -34,7 +34,7 @@ http {
         server_name rabbitmq.sprinthub.ru;
 
         location / {
-            proxy_pass http://dev.sprinthub.ru:15672/;
+            proxy_pass http://rabbitmq:15672/;
         }
     }
 
@@ -43,7 +43,7 @@ http {
         server_name minio.sprinthub.ru;
 
         location / {
-            proxy_pass http://dev.sprinthub.ru:9001/;
+            proxy_pass http://minio:9001/;
         }
     }