From eaaf50cdef55b459e802c4dd8ea000be093afa49 Mon Sep 17 00:00:00 2001
From: henridb <henridb@stud.ntnu.no>
Date: Fri, 3 May 2024 00:25:42 +0200
Subject: [PATCH] fix: fix 20
---
Dockerfile | 1 +
web/nginx.conf | 46 ++++++++++++++--------------------------------
2 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index cf53597..dcf09d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,5 +9,6 @@ RUN npm run build
# Step 2: Setup the server with Nginx
FROM nginx:stable-alpine as production-stage
COPY --from=build-stage /app/dist /usr/share/nginx/html
+COPY web/nginx.conf /etc/nginx/nginx.conf
EXPOSE 5173
CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/web/nginx.conf b/web/nginx.conf
index aba6eb2..bcefea1 100644
--- a/web/nginx.conf
+++ b/web/nginx.conf
@@ -1,40 +1,22 @@
-# Frontend server configuration
-server {
- listen 443 ssl;
- server_name sparesti.org; # Main domain for the frontend
+worker_processes auto;
- ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
- ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
+error_log /var/log/nginx/error.log notice;
+pid /var/run/nginx.pid;
- location / {
- proxy_pass http://vue-frontend:80; # Adjust the port and container name as necessary
- proxy_set_header Host $host;
- 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;
- }
+events {
+ worker_connections 1024;
}
-# API server configuration
-server {
- listen 443 ssl;
- server_name api.sparesti.org; # API subdomain
+http {
+ include /etc/nginx/mime.types;
- ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
- ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
+ server {
+ listen 5173;
+ server_name localhost;
- location / {
- proxy_pass http://spring-backend:8080; # Adjust the port and container name as necessary
- proxy_set_header Host $host;
- 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;
+ location / {
+ root /usr/share/nginx/html;
+ try_files $uri $uri/ /index.html;
+ }
}
-}
-
-# HTTP to HTTPS redirection for main domain and subdomain
-server {
- listen 80;
- server_name sparesti.org api.sparesti.org;
- return 301 https://$host$request_uri;
}
\ No newline at end of file
--
GitLab