diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index 4635e4a..feda70e 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -5,7 +5,6 @@ services: nginx: image: mathwave/sprint-repo:sprint-infra-nginx-dev networks: - - net - battleship-nginx - sprint-nginx - swarmpit-nginx @@ -45,8 +44,7 @@ services: image: rabbitmq:3.10.7-management ports: - "5672:5672" - networks: - - net + - "15672:15672" environment: RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV deploy: @@ -98,8 +96,7 @@ services: MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV ports: - "9000:9000" - networks: - - net + - "9001:9001" deploy: mode: replicated placement: diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 94296d9..00bc6dc 100644 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -5,7 +5,6 @@ services: nginx: image: mathwave/sprint-repo:sprint-infra-nginx-prod networks: - - net - battleship-nginx - sprint-nginx - swarmpit-nginx @@ -45,8 +44,7 @@ services: image: rabbitmq:3.10.7-management ports: - "5672:5672" - networks: - - net + - "15672:15672" environment: RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD deploy: @@ -98,8 +96,7 @@ services: MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD ports: - "9000:9000" - networks: - - net + - "9001:9001" deploy: mode: replicated placement: diff --git a/.deploy-swarmpit/deploy-dev.yaml b/.deploy-swarmpit/deploy-dev.yaml index 474b450..e0f3981 100644 --- a/.deploy-swarmpit/deploy-dev.yaml +++ b/.deploy-swarmpit/deploy-dev.yaml @@ -15,7 +15,6 @@ services: retries: 3 networks: - net - - swarmpit-nginx ports: - "888:8080" deploy: diff --git a/.deploy-swarmpit/deploy-prod.yaml b/.deploy-swarmpit/deploy-prod.yaml index 474b450..e0f3981 100644 --- a/.deploy-swarmpit/deploy-prod.yaml +++ b/.deploy-swarmpit/deploy-prod.yaml @@ -15,7 +15,6 @@ services: retries: 3 networks: - net - - swarmpit-nginx ports: - "888:8080" deploy: diff --git a/nginx/nginx-dev/nginx-dev.conf b/nginx/nginx-dev/nginx-dev.conf index 31b23cb..7d8185a 100644 --- a/nginx/nginx-dev/nginx-dev.conf +++ b/nginx/nginx-dev/nginx-dev.conf @@ -24,7 +24,7 @@ http { add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / { - proxy_pass http://app:8080/; + proxy_pass http://develop.sprinthub.ru:888/; } } @@ -43,7 +43,7 @@ http { add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / { - proxy_pass http://rabbitmq:15672/; + proxy_pass http://develop.sprinthub.ru:15672/; } } @@ -62,7 +62,7 @@ http { add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / { - proxy_pass http://minio:9001/; + proxy_pass http://develop.sprinthub.ru:9001/; } } diff --git a/nginx/nginx-prod/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf index f844001..4545a44 100644 --- a/nginx/nginx-prod/nginx-prod.conf +++ b/nginx/nginx-prod/nginx-prod.conf @@ -6,7 +6,7 @@ http { server { listen 80; server_name gitlab.sprinthub.ru; - + location / { proxy_pass http://dev.sprinthub.ru:1234/; } @@ -52,7 +52,7 @@ http { add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / { - proxy_pass http://app:8080/; + proxy_pass http://dev.sprinthub.ru:888/; } } @@ -71,7 +71,7 @@ http { add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / { - proxy_pass http://rabbitmq:15672/; + proxy_pass http://dev.sprinthub.ru:15672/; } } @@ -90,7 +90,7 @@ http { add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; location / { - proxy_pass http://minio:9001/; + proxy_pass http://dev.sprinthub.ru:9001/; } }