1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00

Починка добавления через докер 3

This commit is contained in:
MoonTestUse1
2024-12-27 05:52:25 +06:00
parent 52abcec8ee
commit 734cc478e0
2 changed files with 37 additions and 54 deletions

View File

@@ -1,48 +1,6 @@
upstream backend_upstream {
server support-backend:8000;
}
server { server {
listen 80 default_server; listen 80;
server_name itformhelp.ru www.itformhelp.ru; server_name itformhelp.ru www.itformhelp.ru;
root /usr/share/nginx/html;
index index.html;
# Logging
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
# SPA routes
location / {
try_files $uri $uri/ /index.html;
add_header Cache-Control "no-store, no-cache, must-revalidate";
}
# API proxy
location /api/ {
proxy_pass http://backend_upstream;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
# Редирект с IP на домен
server {
listen 80;
server_name 185.139.70.62;
return 301 http://itformhelp.ru$request_uri;
}
server {
listen 80;
server_name localhost;
location / { location / {
proxy_pass http://frontend:5173; proxy_pass http://frontend:5173;
@@ -51,11 +9,38 @@ server {
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade; proxy_cache_bypass $http_upgrade;
# WebSocket headers
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
# WebSocket timeouts
proxy_read_timeout 86400;
proxy_send_timeout 86400;
} }
location /api { location /api {
proxy_pass http://backend:8000; proxy_pass http://backend:8000;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
} }
# WebSocket HMR endpoint
location /_hmr {
proxy_pass http://frontend:5173;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
}
}
# Redirect from IP to domain
server {
listen 80;
server_name 185.139.70.62;
return 301 http://itformhelp.ru$request_uri;
} }

View File

@@ -1,20 +1,18 @@
import { defineConfig } from 'vite'; import { defineConfig } from 'vite';
import vue from '@vitejs/plugin-vue'; import vue from '@vitejs/plugin-vue';
import { fileURLToPath, URL } from 'url';
export default defineConfig({ export default defineConfig({
plugins: [vue()], plugins: [vue()],
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
}
},
server: { server: {
proxy: { host: true,
'/api': { port: 5173,
target: 'http://localhost:8000', watch: {
changeOrigin: true usePolling: true
} },
hmr: {
host: 'itformhelp.ru',
protocol: 'http',
clientPort: 80
} }
} }
}); });