From 4442957e4c5e5e6e9811aa373177863194b4670d Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 5 Sep 2022 20:11:17 +0300 Subject: [PATCH] ssl --- nginx/nginx-dev/nginx-dev.conf | 45 ++------------------------ nginx/nginx-prod/nginx-prod.conf | 54 ++------------------------------ 2 files changed, 6 insertions(+), 93 deletions(-) diff --git a/nginx/nginx-dev/nginx-dev.conf b/nginx/nginx-dev/nginx-dev.conf index be4dc31..31b23cb 100644 --- a/nginx/nginx-dev/nginx-dev.conf +++ b/nginx/nginx-dev/nginx-dev.conf @@ -4,12 +4,9 @@ http { client_max_body_size 50m; server { - listen 80; - server_name swarmpit.develop.sprinthub.ru; - - location / { - proxy_pass http://app:8080/; - } + listen 80; + server_name *.develop.sprinthub.ru; + return 301 https://$host$request_uri; } server { @@ -31,15 +28,6 @@ http { } } - server { - listen 80; - server_name rabbitmq.develop.sprinthub.ru; - - location / { - proxy_pass http://rabbitmq:15672/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -59,15 +47,6 @@ http { } } - server { - listen 80; - server_name minio.develop.sprinthub.ru; - - location / { - proxy_pass http://minio:9001/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -87,15 +66,6 @@ http { } } - server { - listen 80; - server_name battleship.develop.sprinthub.ru; - - location / { - proxy_pass http://battleship-nginx:1236/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -115,15 +85,6 @@ http { } } - server { - listen 80; - server_name dev.develop.sprinthub.ru; - - location / { - proxy_pass http://sprint-nginx:1235/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; diff --git a/nginx/nginx-prod/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf index 1a3cc0e..9d1faa2 100644 --- a/nginx/nginx-prod/nginx-prod.conf +++ b/nginx/nginx-prod/nginx-prod.conf @@ -4,12 +4,9 @@ http { client_max_body_size 50m; server { - listen 80; - server_name gitlab.sprinthub.ru; - - location / { - proxy_pass http://dev.sprinthub.ru:1234/; - } + listen 80; + server_name *.sprinthub.ru; + return 301 https://$host$request_uri; } server { @@ -31,15 +28,6 @@ http { } } - server { - listen 80; - server_name swarmpit.sprinthub.ru; - - location / { - proxy_pass http://app:8080/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -59,15 +47,6 @@ http { } } - server { - listen 80; - server_name rabbitmq.sprinthub.ru; - - location / { - proxy_pass http://rabbitmq:15672/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -87,15 +66,6 @@ http { } } - server { - listen 80; - server_name minio.sprinthub.ru; - - location / { - proxy_pass http://minio:9001/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -115,15 +85,6 @@ http { } } - server { - listen 80; - server_name battleship.sprinthub.ru; - - location / { - proxy_pass http://battleship-nginx:1236/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -143,15 +104,6 @@ http { } } - server { - listen 80; - server_name dev.sprinthub.ru; - - location / { - proxy_pass http://sprint-nginx:1235/; - } - } - server { listen 443 ssl http2; listen [::]:443 ssl http2;