From 26639fde5b24fa394cafdbc115ee44216c1bb6a5 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 11 Aug 2023 12:04:45 +0300
Subject: [PATCH] Update network setup

---
 nginx/default.conf                        | 10 +++++-----
 rsconcept/backend/.env.prod               |  4 ++--
 rsconcept/frontend/src/utils/constants.ts |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nginx/default.conf b/nginx/default.conf
index 6ed9538c..2e2e0032 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -8,9 +8,9 @@ upstream innerreact {
 
 server {
     listen 8000 ssl;
-    ssl_certificate /etc/ssl/private/portal-cert.pem;
-    ssl_certificate_key /etc/ssl/private/portal-key.pem;
-    server_name dev.concept.ru www.dev.concept.ru api.portal.acconcept.ru www.api.portal.acconcept.ru mail.acconcept.ru www.mail.acconcept.ru;
+    ssl_certificate /etc/ssl/private/front-cert.pem;
+    ssl_certificate_key /etc/ssl/private/front-key.pem;
+    server_name dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru api.portal.acconcept.ru www.api.portal.acconcept.ru mail.acconcept.ru www.mail.acconcept.ru;
 
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -28,8 +28,8 @@ server {
 
 server {
     listen 3000 ssl;
-    ssl_certificate /etc/ssl/private/portal-cert.pem;
-    ssl_certificate_key /etc/ssl/private/portal-key.pem;
+    ssl_certificate /etc/ssl/private/front-cert.pem;
+    ssl_certificate_key /etc/ssl/private/front-key.pem;
     server_name dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru mail.acconcept.ru www.mail.acconcept.ru;
     
     location / {
diff --git a/rsconcept/backend/.env.prod b/rsconcept/backend/.env.prod
index fdd7a073..a0608fea 100644
--- a/rsconcept/backend/.env.prod
+++ b/rsconcept/backend/.env.prod
@@ -1,8 +1,8 @@
 # Application settings
 
 ALLOWED_HOSTS=localhost;portal.acconcept.ru;dev.concept.ru;mail.acconcept.ru;
-CSRF_TRUSTED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://mail.acconcept.ru:8081;https://mail.acconcept.ru:8082;
-CORS_ALLOWED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://mail.acconcept.ru:8081;https://mail.acconcept.ru:8082;
+CSRF_TRUSTED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://portal.acconcept.ru:8081;https://mail.acconcept.ru:8081;
+CORS_ALLOWED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://portal.acconcept.ru:8081;https://mail.acconcept.ru:8081;
 
 
 # File locations
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 8019e12b..e14e1276 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -1,6 +1,6 @@
 // Constants
 const prod = {
-  backend: 'https://mail.acconcept.ru:8082',
+  backend: 'https://portal.acconcept.ru:8082',
   // backend: 'https://dev.concept.ru:8000',
   // backend: 'https://localhost:8000',
   // backend: 'https://api.portal.concept.ru',