Finalize portal URLs

This commit is contained in:
IRBorisov 2023-09-16 20:32:56 +03:00
parent 65aecea8d2
commit 5a7395e5be
5 changed files with 54 additions and 15 deletions

View File

@ -10,7 +10,7 @@ server {
listen 80; listen 80;
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; server_tokens off;
location /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
@ -18,7 +18,7 @@ server {
} }
location / { 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;
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; server_tokens off;
location /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
@ -34,7 +34,7 @@ server {
} }
location / { 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;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
ssl_certificate /etc/nginx/ssl/live/api.cportal.acconcept.ru/fullchain.pem; ssl_certificate /etc/nginx/ssl/live/api.portal.acconcept.ru/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/live/api.cportal.acconcept.ru/privkey.pem; ssl_certificate_key /etc/nginx/ssl/live/api.portal.acconcept.ru/privkey.pem;
server_name api.cportal.acconcept.ru www.api.cportal.acconcept.ru; server_name api.portal.acconcept.ru www.api.portal.acconcept.ru;
location / { location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -64,9 +64,9 @@ server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
ssl_certificate /etc/nginx/ssl/live/cportal.acconcept.ru/fullchain.pem; ssl_certificate /etc/nginx/ssl/live/portal.acconcept.ru/fullchain.pem;
ssl_certificate_key /etc/nginx/ssl/live/cportal.acconcept.ru/privkey.pem; ssl_certificate_key /etc/nginx/ssl/live/portal.acconcept.ru/privkey.pem;
server_name cportal.acconcept.ru www.cportal.acconcept.ru; server_name portal.acconcept.ru www.portal.acconcept.ru;
location / { location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

39
nginx/starter.conf Normal file
View File

@ -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;
}
}

View File

@ -1,9 +1,9 @@
# Application settings # Application settings
# SECRET_KEY= # SECRET_KEY=
ALLOWED_HOSTS=cportal.acconcept.ru;api.cportal.acconcept.ru ALLOWED_HOSTS=portal.acconcept.ru;api.portal.acconcept.ru
CSRF_TRUSTED_ORIGINS=https://cportal.acconcept.ru;https://api.cportal.acconcept.ru CSRF_TRUSTED_ORIGINS=https://portal.acconcept.ru;https://api.portal.acconcept.ru
CORS_ALLOWED_ORIGINS=https://cportal.acconcept.ru CORS_ALLOWED_ORIGINS=https://portal.acconcept.ru
# File locations # File locations

View File

@ -1,5 +1,5 @@
# Frontend public settings: Production # 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_PORT=443
VITE_PORTAL_FRONT_HTTPS=true VITE_PORTAL_FRONT_HTTPS=true

View File

@ -21,7 +21,7 @@ export const urls = {
gitrepo: 'https://github.com/IRBorisov/ConceptPortal', gitrepo: 'https://github.com/IRBorisov/ConceptPortal',
mailportal: 'mailto:portal@acconcept.ru', mailportal: 'mailto:portal@acconcept.ru',
restapi: 'https://api.cportal.acconcept.ru/docs/' restapi: 'https://api.portal.acconcept.ru/docs/'
}; };
export const resources = { export const resources = {