Release 11.3

Frontend/nginx.conf

@@ -12,8 +12,31 @@ server {
         add_header Cache-Control "private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
     }
 
+<<<<<<< HEAD
     #error_page  404              /404.html;
 
+=======
+    location /java/ {
+        proxy_pass http://xmltools-backend:8081/;
+        proxy_set_header Host $host;
+    }
+
+    location /libxml/ {
+        proxy_pass http://xmltools-libxml-backend/;
+        proxy_set_header Host $host;
+    }
+
+    location /mock/ {
+        proxy_pass http://xmltools-mocked-services:8097/;
+        proxy_set_header Host $host;
+        proxy_set_header Content-Type $http_content_type;
+    }
+
+    #error_page  404              /404.html;
+
+
+
+>>>>>>> master
     # redirect server error pages to the static page /50x.html
     #
     error_page   500 502 503 504  /50x.html;