From 5a7395e5bef80dceab7af32c659904ab1c10a910 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sat, 16 Sep 2023 20:32:56 +0300
Subject: [PATCH] Finalize portal URLs

---
 nginx/production.conf                     | 20 ++++++------
 nginx/starter.conf                        | 39 +++++++++++++++++++++++
 rsconcept/backend/.env.prod               |  6 ++--
 rsconcept/frontend/env/.env.production    |  2 +-
 rsconcept/frontend/src/utils/constants.ts |  2 +-
 5 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 nginx/starter.conf

diff --git a/nginx/production.conf b/nginx/production.conf
index 89ed51e7..2f7414a7 100644
--- a/nginx/production.conf
+++ b/nginx/production.conf
@@ -10,7 +10,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name cportal.acconcept.ru www.cportal.acconcept.ru;
+    server_name portal.acconcept.ru www.portal.acconcept.ru;
     server_tokens off;
 
     location /.well-known/acme-challenge/ {
@@ -18,7 +18,7 @@ server {
     }
 
     location / {
-        return 301 https://cportal.acconcept.ru$request_uri;
+        return 301 https://portal.acconcept.ru$request_uri;
     }
 }
 
@@ -26,7 +26,7 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name api.cportal.acconcept.ru www.api.cportal.acconcept.ru;
+    server_name api.portal.acconcept.ru www.api.portal.acconcept.ru;
     server_tokens off;
 
     location /.well-known/acme-challenge/ {
@@ -34,7 +34,7 @@ server {
     }
 
     location / {
-        return 301 https://api.cportal.acconcept.ru$request_uri;
+        return 301 https://api.portal.acconcept.ru$request_uri;
     }
 }
 
@@ -42,9 +42,9 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
 
-    ssl_certificate /etc/nginx/ssl/live/api.cportal.acconcept.ru/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/live/api.cportal.acconcept.ru/privkey.pem;
-    server_name api.cportal.acconcept.ru www.api.cportal.acconcept.ru;
+    ssl_certificate /etc/nginx/ssl/live/api.portal.acconcept.ru/fullchain.pem;
+    ssl_certificate_key /etc/nginx/ssl/live/api.portal.acconcept.ru/privkey.pem;
+    server_name api.portal.acconcept.ru www.api.portal.acconcept.ru;
 
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -64,9 +64,9 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
 
-    ssl_certificate /etc/nginx/ssl/live/cportal.acconcept.ru/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/live/cportal.acconcept.ru/privkey.pem;
-    server_name cportal.acconcept.ru www.cportal.acconcept.ru;
+    ssl_certificate /etc/nginx/ssl/live/portal.acconcept.ru/fullchain.pem;
+    ssl_certificate_key /etc/nginx/ssl/live/portal.acconcept.ru/privkey.pem;
+    server_name portal.acconcept.ru www.portal.acconcept.ru;
     
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/nginx/starter.conf b/nginx/starter.conf
new file mode 100644
index 00000000..054d6459
--- /dev/null
+++ b/nginx/starter.conf
@@ -0,0 +1,39 @@
+upstream innerdjango {
+    server backend:8000;
+}
+
+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;
+
+    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;
+    }
+}
diff --git a/rsconcept/backend/.env.prod b/rsconcept/backend/.env.prod
index 1b3cf744..1ca6d4a2 100644
--- a/rsconcept/backend/.env.prod
+++ b/rsconcept/backend/.env.prod
@@ -1,9 +1,9 @@
 # Application settings
 
 # SECRET_KEY=
-ALLOWED_HOSTS=cportal.acconcept.ru;api.cportal.acconcept.ru
-CSRF_TRUSTED_ORIGINS=https://cportal.acconcept.ru;https://api.cportal.acconcept.ru
-CORS_ALLOWED_ORIGINS=https://cportal.acconcept.ru
+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
 
 
 # File locations
diff --git a/rsconcept/frontend/env/.env.production b/rsconcept/frontend/env/.env.production
index 6cf29276..7d450ce8 100644
--- a/rsconcept/frontend/env/.env.production
+++ b/rsconcept/frontend/env/.env.production
@@ -1,5 +1,5 @@
 # Frontend public settings: Production
 
-VITE_PORTAL_BACKEND=https://api.cportal.acconcept.ru
+VITE_PORTAL_BACKEND=https://api.portal.acconcept.ru
 VITE_PORTAL_FRONT_PORT=443
 VITE_PORTAL_FRONT_HTTPS=true
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 506c3bfa..9cec7c85 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -21,7 +21,7 @@ export const urls = {
 
   gitrepo: 'https://github.com/IRBorisov/ConceptPortal',
   mailportal: 'mailto:portal@acconcept.ru',
-  restapi: 'https://api.cportal.acconcept.ru/docs/'
+  restapi: 'https://api.portal.acconcept.ru/docs/'
 };
 
 export const resources = {