Merge branch 'bugfix/deployment-nginx-confluence-paths' into 'master'

bugfix/deployment-nginx-confluence-paths

See merge request devops/k8s-deployments!62

01_onsite/01_dev/semcust/deployment.yaml

@@ -132,6 +132,13 @@ data:
         try_files $uri $uri /index.html =404;
       }
 
+      location /confluence {
+        root /srv/semcust;
+        #add_header X-Frame-Options "SAMEORIGIN";
+        index index.html index.htm;
+        try_files $uri $uri /index.html =404;
+      }
+
       location ~ ^/api {
         proxy_pass        http://backend;
         proxy_redirect    off;
@@ -171,7 +178,20 @@ data:
         send_timeout 300s;
       }
 
-      location /confluence {
+      location /confluence/page-overview/ {
+        proxy_pass        http://backend;
+        proxy_redirect    off;
+
+        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_read_timeout 300s;
+        proxy_send_timeout 300s;
+        send_timeout 300s;
+      }
+
+      location /confluence/storage/ {
         proxy_pass        http://backend;
         proxy_redirect    off;
 

01_onsite/02_qa/semcust/deployment.yaml

@@ -131,6 +131,13 @@ data:
         try_files $uri $uri /index.html =404;
       }
 
+      location /confluence {
+        root /srv/semcust;
+        #add_header X-Frame-Options "SAMEORIGIN";
+        index index.html index.htm;
+        try_files $uri $uri /index.html =404;
+      }
+
       location ~ ^/api {
         proxy_pass        http://backend;
         proxy_redirect    off;
@@ -170,7 +177,20 @@ data:
         send_timeout 300s;
       }
 
-      location /confluence {
+      location /confluence/page-overview/ {
+        proxy_pass        http://backend;
+        proxy_redirect    off;
+
+        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_read_timeout 300s;
+        proxy_send_timeout 300s;
+        send_timeout 300s;
+      }
+
+      location /confluence/storage/ {
         proxy_pass        http://backend;
         proxy_redirect    off;