diff --git a/nginx/production.conf b/nginx/production.conf index 2f7414a7..2c74fa62 100644 --- a/nginx/production.conf +++ b/nginx/production.conf @@ -6,6 +6,23 @@ upstream innerreact { server frontend:3000; } + +server { + listen 80; + listen [::]:80; + + server_name api.portal.acconcept.ru www.api.portal.acconcept.ru; + server_tokens off; + + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } + + location / { + return 301 https://api.portal.acconcept.ru$request_uri; + } +} + server { listen 80; listen [::]:80; @@ -22,22 +39,6 @@ server { } } -server { - listen 80; - listen [::]:80; - - server_name api.portal.acconcept.ru www.api.portal.acconcept.ru; - server_tokens off; - - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - location / { - return 301 https://api.portal.acconcept.ru$request_uri; - } -} - server { listen 443 ssl http2; listen [::]:443 ssl http2; diff --git a/nginx/starter.conf b/nginx/starter.conf index 054d6459..fb4b491d 100644 --- a/nginx/starter.conf +++ b/nginx/starter.conf @@ -6,22 +6,6 @@ upstream innerreact { server frontend:3000; } -server { - listen 80; - listen [::]:80; - - server_name portal.acconcept.ru www.portal.acconcept.ru; - server_tokens off; - - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - location / { - return 301 https://portal.acconcept.ru$request_uri; - } -} - server { listen 80; listen [::]:80; @@ -37,3 +21,19 @@ server { return 301 https://api.portal.acconcept.ru$request_uri; } } + +server { + listen 80; + listen [::]:80; + + server_name portal.acconcept.ru www.portal.acconcept.ru; + server_tokens off; + + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } + + location / { + return 301 https://portal.acconcept.ru$request_uri; + } +} diff --git a/rsconcept/backend/.env.prod b/rsconcept/backend/.env.prod index 2c5242aa..1ca6d4a2 100644 --- a/rsconcept/backend/.env.prod +++ b/rsconcept/backend/.env.prod @@ -3,7 +3,7 @@ # SECRET_KEY= ALLOWED_HOSTS=portal.acconcept.ru;api.portal.acconcept.ru CSRF_TRUSTED_ORIGINS=https://portal.acconcept.ru;https://api.portal.acconcept.ru -CORS_ALLOWED_ORIGINS=https://portal.acconcept.ru;https://api.portal.acconcept.ru +CORS_ALLOWED_ORIGINS=https://portal.acconcept.ru # File locations