sprint

.deploy/deploy-dev.yaml

@@ -6,7 +6,6 @@ services:
     ports:
       - "80:80"
     networks:
-      - infra-net
       - battleship-nginx
       - sprint-nginx
     deploy:
@@ -43,8 +42,6 @@ services:
     ports:
       - "5672:5672"
       - "15672:15672"
-    networks:
-      - infra-net
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
     deploy:
@@ -96,6 +93,7 @@ services:
       - infra-net
     ports:
       - "9000:9000"
+      - "9001:9001"
     deploy:
       mode: replicated
       placement:
@@ -111,8 +109,6 @@ volumes:
     driver: local
 
 networks:
-  infra-net:
-    driver: overlay
   battleship-nginx:
     external: true
   sprint-nginx:

.deploy/deploy-prod.yaml

@@ -6,7 +6,6 @@ services:
     ports:
       - "80:80"
     networks:
-      - infra-net
       - battleship-nginx
       - sprint-nginx
     deploy:
@@ -42,8 +41,7 @@ services:
     image: rabbitmq:3.7.9-management
     ports:
       - "5672:5672"
-    networks:
+      - "15672:15672"
-      - infra-net
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD
     deploy:
@@ -93,8 +91,7 @@ services:
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD
     ports:
       - "9000:9000"
-    networks:
+      - "9001:9001"
-      - infra-net
     deploy:
       mode: replicated
       placement:
@@ -110,8 +107,6 @@ volumes:
     driver: local
 
 networks:
-  infra-net:
-    driver: overlay
   battleship-nginx:
     external: true
   sprint-nginx:

nginx/nginx-dev/nginx-dev.conf

@@ -3,15 +3,6 @@ events {}
 http {
     client_max_body_size 50m;
 
-    server {
-        listen      80;
-        server_name dev.develop.sprinthub.ru;
-
-        location / {
-            proxy_pass http://sprint-nginx:1235/;
-        }
-    }
-
     server {
         listen      80;
         server_name swarmpit.develop.sprinthub.ru;
@@ -26,7 +17,7 @@ http {
         server_name rabbitmq.develop.sprinthub.ru;
 
         location / {
-            proxy_pass http://rabbitmq:15672/;
+            proxy_pass http://dev.develop.sprinthub.ru:15672/;
         }
     }
 
@@ -35,7 +26,7 @@ http {
         server_name minio.develop.sprinthub.ru;
 
         location / {
-            proxy_pass http://minio:9001/;
+            proxy_pass http://dev.develop.sprinthub.ru:9001/;
         }
     }
 
@@ -50,10 +41,11 @@ http {
 
     server {
         listen      80;
-        server_name *.develop.sprinthub.ru;
+        server_name dev.develop.sprinthub.ru;
 
         location / {
-            proxy_pass http://develop.sprinthub.ru/;
+            proxy_pass http://sprint-nginx:1235/;
         }
     }
+
 }

nginx/nginx-prod/nginx-prod.conf

@@ -2,14 +2,6 @@ events {}
 
 http {
     client_max_body_size 50m;
-    server {
-        listen      80;
-        server_name dev.sprinthub.ru;
-
-        location / {
-            proxy_pass http://sprint-nginx:1235/;
-        }
-    }
 
     server {
         listen      80;
@@ -34,7 +26,7 @@ http {
         server_name rabbitmq.sprinthub.ru;
 
         location / {
-            proxy_pass http://rabbitmq:15672/;
+            proxy_pass http://dev.sprinthub.ru:15672/;
         }
     }
 
@@ -43,7 +35,7 @@ http {
         server_name minio.sprinthub.ru;
 
         location / {
-            proxy_pass http://minio:9001/;
+            proxy_pass http://dev.sprinthub.ru:9001/;
         }
     }
 
@@ -55,4 +47,13 @@ http {
             proxy_pass http://battleship-nginx:1236/;
         }
     }
+
+    server {
+        listen      80;
+        server_name dev.sprinthub.ru;
+
+        location / {
+            proxy_pass http://sprint-nginx:1235/;
+        }
+    }
 }