From e8d6eb3aae998bb87505347b357c6861bfae98d6 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Tue, 2 Jun 2020 18:46:32 +0530
Subject: [PATCH] Taking content-editor and plugin changes from release-3.0.0
Signed-off-by: Rajesh Rajendran <rjshrjndrn@gmail.com>
---
.../core/nginx-public-ingress/values.j2 | 110 ++++++++++++++++++
1 file changed, 110 insertions(+)
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
index fe6b0e60a..a3d931f92 100644
--- a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
+++ b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -477,6 +477,116 @@ proxyconfig: |
add_header Access-Control-Allow-Methods GET;
proxy_pass https://$s3_bucket/v3/preview/$url_full;
}
+
+ location ~ /content-editor/telemetry|collection-editor/telemetry {
+ rewrite ^/(.*) /$1 break;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP {{ nginx_client_public_ip_header | d('$remote_addr') }};
+ proxy_set_header X-Scheme $scheme;
+ proxy_connect_timeout 5;
+ proxy_send_timeout 60;
+ proxy_read_timeout 70;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header Connection "";
+ proxy_http_version 1.1;
+ proxy_pass http://player;
+ }
+ location ~* ^/content-editor/(.*) {
+ # Enabling compression
+ gzip on;
+ gzip_min_length 100000;
+ gzip_proxied expired no-cache no-store private auth;
+ gzip_types application/javascript application/x-javascript text/css text/javascript;
+ if ($request_method = OPTIONS ) {
+ add_header Access-Control-Allow-Origin "*" ;
+ add_header Access-Control-Allow-Methods "GET, OPTIONS, PATCH, POST";
+ add_header Access-Control-Allow-Headers "Access-Control-Allow-Origin, Authorization, Content-Type, user-id";
+ # add_header Access-Control-Allow-Credentials "true";
+ add_header Content-Length 0;
+ add_header Content-Type text/plain;
+ return 200;
+ }
+ set $s3_bucket "{{plugin_upstream_url}}";
+ set $url_full '$1';
+ proxy_http_version 1.1;
+ proxy_set_header Host "{{plugin_upstream_url.split('/')[0]|lower}}";
+ proxy_set_header Authorization '';
+ proxy_hide_header Access-Control-Allow-Origin;
+ proxy_hide_header Access-Control-Allow-Methods;
+ proxy_hide_header x-amz-id-2;
+ proxy_hide_header x-amz-request-id;
+ proxy_hide_header Set-Cookie;
+ proxy_ignore_headers "Set-Cookie";
+ proxy_buffering off;
+ proxy_intercept_errors on;
+ add_header Access-Control-Allow-Origin "*" ;
+ add_header Access-Control-Allow-Methods GET;
+ proxy_pass https://$s3_bucket/content-editor/$url_full;
+ }
+ location ~* ^/collection-editor/(.*) {
+ # Enabling compression
+ gzip on;
+ gzip_min_length 100000;
+ gzip_proxied expired no-cache no-store private auth;
+ gzip_types application/javascript application/x-javascript text/css text/javascript;
+ if ($request_method = OPTIONS ) {
+ add_header Access-Control-Allow-Origin "*" ;
+ add_header Access-Control-Allow-Methods "GET, OPTIONS, PATCH, POST";
+ add_header Access-Control-Allow-Headers "Access-Control-Allow-Origin, Authorization, Content-Type, user-id";
+ # add_header Access-Control-Allow-Credentials "true";
+ add_header Content-Length 0;
+ add_header Content-Type text/plain;
+ return 200;
+ }
+ set $s3_bucket "{{plugin_upstream_url}}";
+ set $url_full '$1';
+ proxy_http_version 1.1;
+ proxy_set_header Host "{{plugin_upstream_url.split('/')[0]|lower}}";
+ proxy_set_header Authorization '';
+ proxy_hide_header Access-Control-Allow-Origin;
+ proxy_hide_header Access-Control-Allow-Methods;
+ proxy_hide_header x-amz-id-2;
+ proxy_hide_header x-amz-request-id;
+ proxy_hide_header Set-Cookie;
+ proxy_ignore_headers "Set-Cookie";
+ proxy_buffering off;
+ proxy_intercept_errors on;
+ add_header Access-Control-Allow-Origin "*" ;
+ add_header Access-Control-Allow-Methods GET;
+ proxy_pass https://$s3_bucket/collection-editor/$url_full;
+ }
+ location ~* ^/generic-editor/(.*) {
+ # Enabling compression
+ gzip on;
+ gzip_min_length 100000;
+ gzip_proxied expired no-cache no-store private auth;
+ gzip_types application/javascript application/x-javascript text/css text/javascript;
+ if ($request_method = OPTIONS ) {
+ add_header Access-Control-Allow-Origin "*" ;
+ add_header Access-Control-Allow-Methods "GET, OPTIONS, PATCH, POST";
+ add_header Access-Control-Allow-Headers "Access-Control-Allow-Origin, Authorization, Content-Type, user-id";
+ # add_header Access-Control-Allow-Credentials "true";
+ add_header Content-Length 0;
+ add_header Content-Type text/plain;
+ return 200;
+ }
+ set $s3_bucket "{{plugin_upstream_url}}";
+ set $url_full '$1';
+ proxy_http_version 1.1;
+ proxy_set_header Host "{{plugin_upstream_url.split('/')[0]|lower}}";
+ proxy_set_header Authorization '';
+ proxy_hide_header Access-Control-Allow-Origin;
+ proxy_hide_header Access-Control-Allow-Methods;
+ proxy_hide_header x-amz-id-2;
+ proxy_hide_header x-amz-request-id;
+ proxy_hide_header Set-Cookie;
+ proxy_ignore_headers "Set-Cookie";
+ proxy_buffering off;
+ proxy_intercept_errors on;
+ add_header Access-Control-Allow-Origin "*" ;
+ add_header Access-Control-Allow-Methods GET;
+ proxy_pass https://$s3_bucket/generic-editor/$url_full;
+ }
location ~* ^/content-plugins/(.*) {
# Enabling cache for Response code 200
expires 1M;
--
GitLab