Features: 1) Replace variables with static values for domain, backend, and frontend paths in Nginx configuration; 2) Update root paths for consistency with static and Nuxt frontend integration;
Fixes: 1) Addressed trailing variable usage causing inconsistent behavior in certificate links and path resolution; 2) Corrected alias and root paths for robots.txt and media/static assets; Extra: Streamlined Nginx configuration for better maintainability and clarity;
This commit is contained in:
parent
658e799076
commit
2a7ec836b0
1 changed files with 24 additions and 36 deletions
60
nginx
60
nginx
|
|
@ -7,13 +7,10 @@ upstream prom_backend {
|
|||
}
|
||||
|
||||
server {
|
||||
set $domain evibes.com;
|
||||
set $backend_root evibes-backend-django;
|
||||
set $frontend_root evibes-frontend-vue;
|
||||
listen 443 ssl http2;
|
||||
server_name api.$domain b2b.$domain;
|
||||
ssl_certificate /etc/letsencrypt/live/$domain/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/$domain/privkey.pem;
|
||||
server_name api.evibes.com b2b.evibes.com;
|
||||
ssl_certificate /etc/letsencrypt/live/evibes.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/evibes.com/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
|
|
@ -33,41 +30,38 @@ server {
|
|||
|
||||
location /favicon.ico {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root/static;
|
||||
root /var/jenkins/workspace/evibes/static;
|
||||
}
|
||||
|
||||
location = /robots.txt {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
alias /var/jenkins/workspace/$backend_root/static/robots_backend.txt;
|
||||
alias /var/jenkins/workspace/evibes/static/robots_backend.txt;
|
||||
default_type text/plain;
|
||||
}
|
||||
|
||||
location /media/ {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root;
|
||||
root /var/jenkins/workspace/evibes;
|
||||
}
|
||||
|
||||
location /static/ {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root;
|
||||
root /var/jenkins/workspace/evibes;
|
||||
}
|
||||
|
||||
error_page 500 502 503 504 /maintenance.html;
|
||||
location = /maintenance.html {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root/static;
|
||||
root /var/jenkins/workspace/evibes/static;
|
||||
internal;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
set $domain evibes.com;
|
||||
set $backend_root evibes-backend-django;
|
||||
set $frontend_root evibes-frontend-vue;
|
||||
listen 443 ssl http2;
|
||||
server_name $domain www.$domain;
|
||||
ssl_certificate /etc/letsencrypt/live/$domain/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/$domain/privkey.pem;
|
||||
server_name evibes.com www.evibes.com;
|
||||
ssl_certificate /etc/letsencrypt/live/evibes.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/evibes.com/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
|
|
@ -77,7 +71,7 @@ server {
|
|||
add_header Referrer-Policy no-referrer-when-downgrade always;
|
||||
|
||||
location ~* \.(?:js|css|png|jpe?g|gif|svg|woff2?)$ {
|
||||
root /var/jenkins/workspace/$frontend_root/dist;
|
||||
root /var/jenkins/workspace/evibes-frontend-nuxt/dist;
|
||||
try_files $uri =404;
|
||||
add_header Cache-Control "public, max-age=31536000, immutable";
|
||||
access_log off;
|
||||
|
|
@ -85,22 +79,22 @@ server {
|
|||
|
||||
location /favicon.ico {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root/static;
|
||||
root /var/jenkins/workspace/evibes/static;
|
||||
}
|
||||
|
||||
location / {
|
||||
root /var/jenkins/workspace/$frontend_root/dist;
|
||||
root /var/jenkins/workspace/evibes-frontend-nuxt/dist;
|
||||
try_files $uri $uri/ /index.html @maintenance;
|
||||
}
|
||||
|
||||
location = /index.html {
|
||||
root /var/jenkins/workspace/$frontend_root/dist;
|
||||
root /var/jenkins/workspace/evibes-frontend-nuxt/dist;
|
||||
try_files $uri @maintenance;
|
||||
}
|
||||
|
||||
location = /robots.txt {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
alias /var/jenkins/workspace/$backend_root/static/robots_frontend.txt;
|
||||
alias /var/jenkins/workspace/evibes/static/robots_frontend.txt;
|
||||
default_type text/plain;
|
||||
}
|
||||
|
||||
|
|
@ -120,19 +114,16 @@ server {
|
|||
error_page 503 404 500 502 504 /maintenance.html;
|
||||
location = /maintenance.html {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root/static;
|
||||
root /var/jenkins/workspace/evibes/static;
|
||||
internal;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
set $domain evibes.com;
|
||||
set $backend_root evibes-backend-django;
|
||||
set $frontend_root evibes-frontend-vue;
|
||||
listen 443 ssl http2;
|
||||
server_name prometheus.$domain;
|
||||
ssl_certificate /etc/letsencrypt/live/$domain/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/$domain/privkey.pem;
|
||||
server_name prometheus.evibes.com;
|
||||
ssl_certificate /etc/letsencrypt/live/evibes.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/evibes.com/privkey.pem;
|
||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
|
|
@ -152,28 +143,25 @@ server {
|
|||
|
||||
location = /robots.txt {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
alias /var/jenkins/workspace/$backend_root/static/robots_backend.txt;
|
||||
alias /var/jenkins/workspace/evibes/static/robots_backend.txt;
|
||||
default_type text/plain;
|
||||
}
|
||||
|
||||
location /favicon.ico {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root/static;
|
||||
root /var/jenkins/workspace/evibes/static;
|
||||
}
|
||||
|
||||
error_page 500 502 503 504 /maintenance.html;
|
||||
location = /maintenance.html {
|
||||
add_header Access-Control-Allow-Origin "*";
|
||||
root /var/jenkins/workspace/$backend_root/static;
|
||||
root /var/jenkins/workspace/evibes/static;
|
||||
internal;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
set $domain evibes.com;
|
||||
set $backend_root evibes-backend-django;
|
||||
set $frontend_root evibes-frontend-vue;
|
||||
listen 80;
|
||||
server_name api.$domain b2b.$domain www.$domain $domain prometheus.$domain;
|
||||
server_name api.evibes.com b2b.evibes.com www.evibes.com evibes.com prometheus.evibes.com;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue