fix: fix 16

.gitlab-ci.yml

@@ -36,5 +36,5 @@ deploy_docker:
     - apt-get -yqq install ssh
     - apt-get install sshpass
   script:
-    - sshpass -p sParest1en ssh -v -o StrictHostKeyChecking=no root@128.199.53.153 "docker rm -f frontend || true; docker pull registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend && docker run -d -p 443:5173 --name frontend registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend"
+    - sshpass -p sParest1en ssh -v -o StrictHostKeyChecking=no root@128.199.53.153 "docker rm -f frontend || true; docker pull registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend && docker run -d -p 82:5173 --name frontend registry.gitlab.com/$DOCKER_USER/sparesti-registry:frontend"
   when: manual
\ No newline at end of file

Dockerfile

@@ -9,8 +9,5 @@ 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
-COPY web/nginx-selfsigned.crt /etc/ssl/certs/nginx-selfsigned.crt
-COPY web/nginx-selfsigned.key /etc/ssl/private/nginx-selfsigned.key
 
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file

web/nginx.conf

-worker_processes  auto;
-
-error_log  /var/log/nginx/error.log notice;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
+# Frontend server configuration
+server {
+    listen 443 ssl;
+    server_name sparesti.org;  # Main domain for the frontend
+
+    ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
+    ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
+
+    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;
+    }
 }
 
-http {
-    include       /etc/nginx/mime.types;
+# API server configuration
+server {
+    listen 443 ssl;
+    server_name api.sparesti.org;  # API subdomain
 
-    server {
-        listen 5173;
-        server_name localhost;
+    ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
+    ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
 
-        location / {
-            root /usr/share/nginx/html;
-            try_files $uri $uri/ /index.html;
-        }
+    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;
     }
+}
 
-    server {
-            listen 443 ssl;
-            server_name sparesti.org;
-
-            ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
-            ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
-
-            ssl_protocols TLSv1.2 TLSv1.3;
-            ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384';
-            ssl_prefer_server_ciphers on;
-
-            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