Merge remote-tracking branch 'origin/main'

# Conflicts: # src/index.html
base URL angepasst
2026-01-07 13:17:47 +01:00 · 2026-01-07 13:07:30 +01:00
2 changed files with 7 additions and 7 deletions
--- a/nginx.conf
+++ b/nginx.conf
@@ -16,11 +16,11 @@ server {
        proxy_set_header X-Forwarded-Proto $scheme;
    }
    location /CalculateRequest {
-            proxy_pass http://192.168.2.186:9090/CalculateRequest;
+        proxy_pass http://192.168.2.186:9090/CalculateRequest;

-            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;
-        }
+        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;
+    }
 }
--- a/src/index.html
+++ b/src/index.html
@@ -3,7 +3,7 @@
 <head>
  <meta charset="utf-8">
  <title>OMDSAngularWebClient</title>
-  <base href="./">
+  <base href="/produkt">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
Author	SHA1	Message	Date
LukasJuraczka	643c58b161	Merge remote-tracking branch 'origin/main' All checks were successful Angular Build & Deploy / deploy (push) Successful in 47s Details # Conflicts: # src/index.html	2026-01-07 13:17:47 +01:00
LukasJuraczka	292dec587c	base URL angepasst	2026-01-07 13:07:30 +01:00