From 07d596ee6abb3d16a342f9ad950d84defb8d9e49 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Tue, 26 May 2020 20:41:24 +0800 Subject: [PATCH 01/45] api url changed --- lib/desktop_updater.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index cc361d719..36f8e2fd4 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -501,7 +501,8 @@ if (process.env.currentVersion) { getAppVesrion(); },10*60*1000) function getAppVesrion(type='update-check'){ - fetch('https://desktop.staging.nynja.net/appversion', { + // fetch('https://desktop.staging.nynja.net/appversion', { + fetch('https://'+window.location.host+'/appversion', { cache: 'no-store', method: 'GET', headers: { -- GitLab From 8cf5373ad468c8da152c943cb286cdf27077bba5 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Tue, 26 May 2020 22:09:41 +0800 Subject: [PATCH 02/45] build number issue fixed --- lib/desktop_updater.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 36f8e2fd4..d0e965911 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -66,7 +66,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { 'Unable to update, please try again later.')); //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); document.getElementById('update_version_electron').innerHTML = (msgJSON.electron === undefined ? process.versions.electron : msgJSON.electron); document.getElementById('update_version_chromium').innerHTML = (msgJSON.chromium === undefined ? process.versions.chrome : msgJSON.chromium); @@ -97,7 +97,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Unable to update, please try again later.')); - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); //document.getElementById('update_version_electron').innerHTML = msgJSON.electron; //document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; //document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; -- GitLab From 6e2b5465cdf5ae063ae3767bf3202afd80464033 Mon Sep 17 00:00:00 2001 From: jitender Date: Tue, 26 May 2020 23:41:44 +0800 Subject: [PATCH 03/45] updated NGINX to filter join url redirection for desktop based on user agent --- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 6 +++++- charts/nynja-app-web/templates/nginx-configmap.yaml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 00243952f..6e899f906 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -64,7 +64,11 @@ data: set $auth_type "off"; } if ($join_link = 1) { - return 302 https://desktop.$domain/join$request_uri; + if ( $http_user_agent ~ 'Electron' ) { + return 302 https://desktop.$domain/join$request_uri; + } + return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; } # {{ if .Values.auth.basic.enabled }} diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 32c71f0d0..b04912dd7 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -64,6 +64,9 @@ data: set $auth_type "off"; } if ($join_link = 1) { + if ( $http_user_agent ~ 'Electron' ) { + return 302 https://desktop.$domain/join$request_uri; + } return 302 https://web.$domain/join$request_uri; } -- GitLab From 1a0644acc819a5b23cb70908bd1473e35d9c44d4 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 00:18:43 +0800 Subject: [PATCH 04/45] trigger --- charts/nynja-app-desktop/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml index 6f3725380..2d0e38edd 100644 --- a/charts/nynja-app-desktop/values.yaml +++ b/charts/nynja-app-desktop/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 auth: - # Whether of not basic auth should be enabled to access the website + ## Whether of not basic auth should be enabled to access the website basic: enabled: true # the .htpasswd file content, sealed for the target environment (cluster + namespace) -- GitLab From 3bb7ee6c72622cea82584efd8681b50cc0d3b93d Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 00:53:36 +0800 Subject: [PATCH 05/45] updated chart to 0.2.7 --- charts/nynja-app-desktop/Chart.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 343792e45..d30ac6875 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.6 +version: 0.2.7 diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index a70feb13d..a0103f625 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index c845934a3..7d874ab00 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: -- GitLab From c5e7ba9807f5f23dcff6925b6cc52d7b3ba605b0 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 10:33:43 +0800 Subject: [PATCH 06/45] updating web chart to 0.2.4 --- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index bbbbe838d..d38eb5b39 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.1 + version: 0.2.4 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 344502541..4ed210178 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.1 + version: 0.2.4 values: replicaCount: 3 auth: -- GitLab From 7393c6466087ff1e141cc12d096fa5042ab54d27 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 13:28:43 +0800 Subject: [PATCH 07/45] updated charts to web-0.2.5 and desktop-0.2.8 --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/values.yaml | 1 + charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/values.yaml | 1 + releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index d30ac6875..bfe8811ae 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.7 +version: 0.2.8 diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml index 2d0e38edd..2ada0569f 100644 --- a/charts/nynja-app-desktop/values.yaml +++ b/charts/nynja-app-desktop/values.yaml @@ -18,6 +18,7 @@ gateway: - api-gateway.default.svc.cluster.local hosts: - desktop.nynja.net + - join.nynja.net wellKnown: appleAppSiteAssociation: diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index e930b74ad..f2ded2685 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.4 +version: 0.2.5 diff --git a/charts/nynja-app-web/values.yaml b/charts/nynja-app-web/values.yaml index 6856b5936..957d07eb2 100644 --- a/charts/nynja-app-web/values.yaml +++ b/charts/nynja-app-web/values.yaml @@ -18,6 +18,7 @@ gateway: - api-gateway.default.svc.cluster.local hosts: - web.nynja.net + - join.nynja.net wellKnown: appleAppSiteAssociation: diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 58f020026..e01b97318 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.1 + version: 0.2.5 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index a0103f625..ed52017d2 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.7 + version: 0.2.8 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index d38eb5b39..28386eb03 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.4 + version: 0.2.5 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 7d874ab00..dacd9e639 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.7 + version: 0.2.8 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 4ed210178..a211b3f5a 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.4 + version: 0.2.5 values: replicaCount: 3 auth: -- GitLab From 3726a1c45ee120be4403b02e6c8dcd1088b85faa Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 15:14:17 +0800 Subject: [PATCH 08/45] updated nginx config to support deskop in join url --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../nynja-app-desktop/templates/nginx-configmap.yaml | 11 +++++++---- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 12 ++++++++---- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index bfe8811ae..a69aa0d38 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.8 +version: 0.2.9 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 6e899f906..9c6957a4d 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -54,6 +54,8 @@ data: set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; @@ -63,11 +65,12 @@ data: set $join_link 0; set $auth_type "off"; } + if ( $http_user_agent ~ 'Electron' ) { + set $client_type "desktop"; + } if ($join_link = 1) { - if ( $http_user_agent ~ 'Electron' ) { - return 302 https://desktop.$domain/join$request_uri; - } - return 302 https://web.$domain/join$request_uri; + return 302 https://$client_type.$domain/join$request_uri; + #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index f2ded2685..0a4a75b4a 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.5 +version: 0.2.6 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index b04912dd7..50435cd76 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -54,6 +54,8 @@ data: set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; @@ -63,11 +65,13 @@ data: set $join_link 0; set $auth_type "off"; } + if ( $http_user_agent ~ 'Electron' ) { + set $client_type "desktop"; + } if ($join_link = 1) { - if ( $http_user_agent ~ 'Electron' ) { - return 302 https://desktop.$domain/join$request_uri; - } - return 302 https://web.$domain/join$request_uri; + return 302 https://$client_type.$domain/join$request_uri; + #return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; } # {{ if .Values.auth.basic.enabled }} diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index e01b97318..5b985805b 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.5 + version: 0.2.6 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index ed52017d2..d7481da88 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.8 + version: 0.2.9 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 28386eb03..5c96c879e 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.5 + version: 0.2.6 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index dacd9e639..dec95e8b8 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.8 + version: 0.2.9 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index a211b3f5a..b0233ca55 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.5 + version: 0.2.6 values: replicaCount: 3 auth: -- GitLab From e09b1527c82a602616898411f9a328bdf9927f98 Mon Sep 17 00:00:00 2001 From: jitender Date: Wed, 27 May 2020 18:51:10 +0800 Subject: [PATCH 09/45] handled join url with http_referer in nginx --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 2 +- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index a69aa0d38..35e08ae81 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.9 +version: 0.2.10 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 9c6957a4d..56fe24ade 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -65,7 +65,7 @@ data: set $join_link 0; set $auth_type "off"; } - if ( $http_user_agent ~ 'Electron' ) { + if ( $http_referer ~* desktop\.(?.+)$ ) { set $client_type "desktop"; } if ($join_link = 1) { diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 0a4a75b4a..a3de6ea60 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.6 +version: 0.2.7 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 50435cd76..ca5d14eea 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -65,7 +65,7 @@ data: set $join_link 0; set $auth_type "off"; } - if ( $http_user_agent ~ 'Electron' ) { + if ( $http_referer ~* desktop\.(?.+)$ ) { set $client_type "desktop"; } if ($join_link = 1) { diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 5b985805b..e41e04f5d 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.6 + version: 0.2.7 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index d7481da88..f49f1d0d5 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.9 + version: 0.2.10 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 5c96c879e..d3cae4da7 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index dec95e8b8..3086e4c3b 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.9 + version: 0.2.10 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index b0233ca55..b313316dd 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.6 + version: 0.2.7 values: replicaCount: 3 auth: -- GitLab From 164b21d17d44b2d42b101f15b7a553d0ee1397f3 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:02:17 +0800 Subject: [PATCH 10/45] added build number in release notes popup --- lib/desktop_updater.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index d0e965911..68a04b510 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -173,12 +173,12 @@ function showReleaseNotes(type, msgJSON) { // //msgJSON.version // return; // } - + Object.keys(releaseNotes[releaseNote]).map(function(buildNumber, bn){ console.log('[DTU]', 'releaseNotesVersions > releaseNote : ',releaseNote) var SPAN_NODE = document.createElement("SPAN"); SPAN_NODE.style = "font-size: 16px;font-weight: bold;"; - SPAN_NODE.innerText = "Version: " + releaseNote; + SPAN_NODE.innerText = "Version: " + releaseNote+ (buildNumber==="content"?"":" (Build: "+buildNumber+")"); document.getElementById('releases_info').appendChild(SPAN_NODE); @@ -186,7 +186,7 @@ function showReleaseNotes(type, msgJSON) { UL_NODE.style = "margin: 5px 0 5px 15px;list-style: none;list-style-type: disc;list-style-position: outside;"; console.log('[DTU]', 'releaseNotesVersions > releaseNotes[releaseNote] : ',releaseNotes[releaseNote]) - releaseNotes[releaseNote].content.map(function (note, j) { + releaseNotes[releaseNote][buildNumber].map(function (note, j) { var LI_NODE = document.createElement("LI"); LI_NODE.innerText = note; @@ -202,6 +202,23 @@ function showReleaseNotes(type, msgJSON) { } } }); + }); +/*releaseNotes[releaseNote].content.map(function (note, j) { + + var LI_NODE = document.createElement("LI"); + LI_NODE.innerText = note; + LI_NODE.style = "margin-left: 20px;"; + UL_NODE.appendChild(LI_NODE); + // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, LI_NODE, UL_NODE) + if ((j + 1) === releaseNotes[releaseNote].content.length) { + + // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, UL_NODE) + document.getElementById('releases_info').appendChild(UL_NODE) + console.log('[DTU]', (j + 1) , document.getElementById('releases_info').innerHTML) + if ((i + 1) === Object.keys(releaseNotes).length) { + } + } + });*/ }) } function updateVersionNotesClick() { -- GitLab From 03ebbf96ba51d70177cc72f05bb977e326defe20 Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:10:39 +0800 Subject: [PATCH 11/45] build Number added in release notes json file --- lib/releaseNotes/releaseNotesDesktop.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/releaseNotes/releaseNotesDesktop.json b/lib/releaseNotes/releaseNotesDesktop.json index b924862f0..f90059a8f 100644 --- a/lib/releaseNotes/releaseNotesDesktop.json +++ b/lib/releaseNotes/releaseNotesDesktop.json @@ -1,11 +1,11 @@ { "0.4.1": { - "content": [ + "1589451878": [ "Stability improvements" ] }, "0.4.0": { - "content": [ + "1589451878": [ "Electron Framework updated to latest version 8.0.1", "Fixed select all keyboard shortcut (command + A) issue in Mac OS", "Handled mic and camera permission issue on Mac OS", @@ -19,7 +19,7 @@ ] }, "0.3.8": { - "content": [ + "1589451878": [ "Updated login page design.", "Added download guideline in app update process.", "Added release notes in update popup.", @@ -62,4 +62,4 @@ "Added \"Invite by email\" (through add contact)." ] } -} \ No newline at end of file +} -- GitLab From 442b08d2ac9289f6ef8cdde9c020d1166bf2c37a Mon Sep 17 00:00:00 2001 From: System Administrator Date: Wed, 27 May 2020 22:28:49 +0800 Subject: [PATCH 12/45] added check for v0.4.0 fetch appversion --- lib/desktop_updater.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 68a04b510..eadd2bc76 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -28,8 +28,14 @@ ipcRendererUpdateWeb.on('update', function (event, message) { startDownloading() } } else if(msgJSON.key==='update-check-menu') { - getAppVesrion('update-check-menu'); + + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + getAppVesrion('update-check-menu'); // ipcRendererOnUpdateEvent(msgJSON); + } else{ + ipcRendererOnUpdateEvent(msgJSON); + } } else { ipcRendererOnUpdateEvent(msgJSON); @@ -512,11 +518,14 @@ if (process.env.currentVersion) { * Call api to get version(major), build(minor) * and latest notes for release */ + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ getAppVesrion(); setInterval(function(){ console.log('[DTU] CHECK APP VERSION AFTER 10 MINS') getAppVesrion(); - },10*60*1000) + },10*60*1000); + } function getAppVesrion(type='update-check'){ // fetch('https://desktop.staging.nynja.net/appversion', { fetch('https://'+window.location.host+'/appversion', { -- GitLab From 33b4ea8fce290900bbcb9025164cf6f1e1ac0a7c Mon Sep 17 00:00:00 2001 From: System Administrator Date: Thu, 28 May 2020 09:46:58 +0800 Subject: [PATCH 13/45] issue fixed for build number --- lib/desktop_updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index eadd2bc76..b815b7af2 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -199,7 +199,7 @@ function showReleaseNotes(type, msgJSON) { LI_NODE.style = "margin-left: 20px;"; UL_NODE.appendChild(LI_NODE); // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, LI_NODE, UL_NODE) - if ((j + 1) === releaseNotes[releaseNote].content.length) { + if ((j + 1) === releaseNotes[releaseNote][buildNumber].length) { // console.log('[DTU]', (j + 1) , releaseNotes[releaseNote].content.length, UL_NODE) document.getElementById('releases_info').appendChild(UL_NODE) -- GitLab From 2ffda1c137f3078366711c293f6ae781df589588 Mon Sep 17 00:00:00 2001 From: akashtl Date: Thu, 28 May 2020 18:42:29 +0800 Subject: [PATCH 14/45] v0.3.8 support for update --- lib/desktop_updater.js | 78 ++++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 22 deletions(-) mode change 100644 => 100755 lib/desktop_updater.js diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js old mode 100644 new mode 100755 index b815b7af2..4b231460e --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -57,6 +57,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { * currentBuild: 1590208348, * status: 200 */ + var app_ver_split = process.env.currentVersion.split('.'); switch (msgJSON.key) { case 'update-check-menu': //Update UI button or text @@ -65,14 +66,24 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); // document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; + + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : - 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): + 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : - 'Unable to update, please try again later.')); + 'Unable to update, please try again later.')); + + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); + + }else{ + + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; + } - //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ (msgJSON.currentBuild===0?'':' (Build: ' + msgJSON.currentBuild+')'); document.getElementById('update_version_electron').innerHTML = (msgJSON.electron === undefined ? process.versions.electron : msgJSON.electron); document.getElementById('update_version_chromium').innerHTML = (msgJSON.chromium === undefined ? process.versions.chrome : msgJSON.chromium); @@ -97,13 +108,22 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); - document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? - (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : - 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): - (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : - 'Unable to update, please try again later.')); + + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? + (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +' (Build: ' + msgJSON.build + ')' : + 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): + (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : + 'Unable to update, please try again later.')); - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+(msgJSON.currentBuild===0?'': ' (Build: ' + msgJSON.currentBuild+')'); + }else{ + + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; + + } //document.getElementById('update_version_electron').innerHTML = msgJSON.electron; //document.getElementById('update_version_chromium').innerHTML = msgJSON.chromium; //document.getElementById('update_version_nodejs').innerHTML = msgJSON.nodejs; @@ -242,19 +262,27 @@ function updateInfoClick(msgJSON) { // // // document.getElementById('update-install').removeEventListener('click'); // document.getElementById('update_download_install').style = ''; // document.getElementById('update_download_install').addEventListener("click", updateConfClick) - if(msgJSON.upgradeType==="version"){ - // alert(1) - document.getElementById('update_download_install').innerHTML = 'Update'; - document.getElementById('update_download_install').style = ''; - document.getElementById('update_download_install').addEventListener("click", updateConfClick) - document.getElementById('releases_info_p').innerHTML = 'After finishing the download, NYNJA application will be restarted to apply new updates.'; + + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + if(msgJSON.upgradeType==="version"){ + // alert(1) + document.getElementById('update_download_install').innerHTML = 'Update'; + document.getElementById('update_download_install').style = ''; + document.getElementById('update_download_install').addEventListener("click", updateConfClick) + document.getElementById('releases_info_p').innerHTML = 'After finishing the download, NYNJA application will be restarted to apply new updates.'; + }else{ + // alert(2) + + document.getElementById('update_download_install').innerHTML = 'Refresh Only'; + document.getElementById('update_refresh_only').style = ''; + document.getElementById('update_refresh_only').addEventListener("click", startDownloading) + document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; + } }else{ - // alert(2) - - document.getElementById('update_download_install').innerHTML = 'Refresh Only'; - document.getElementById('update_refresh_only').style = ''; - document.getElementById('update_refresh_only').addEventListener("click", startDownloading) - document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; + + document.getElementById('update_download_install').style = ''; + document.getElementById('update_download_install').addEventListener("click", updateConfClick) } } } @@ -281,6 +309,8 @@ function updateConfClick(msgJSON) {//alert(1); */ function startDownloading() { console.log('start-download') + var app_ver_split = process.env.currentVersion.split('.'); + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ //Update confirm and notify main process if(isVersionUpdate){ // alert('start1') @@ -293,7 +323,11 @@ function startDownloading() { appversionObj.action = 'update-build'; ipcRendererUpdateWeb.send('update-main', appversionObj); } + }else{ + document.getElementById('update-notify-box').style = ''; + ipcRendererUpdateWeb.send('update-main', 'update-start'); + } //ipcRendererUpdateWeb.send('update-main', 'update-start'); document.getElementById('update-info').style = 'display: none;'; document.getElementById('update-desc-box').style = 'display: none;'; -- GitLab From 89846f06ae2301adb3190c958b081dabfa95f277 Mon Sep 17 00:00:00 2001 From: akashtl Date: Thu, 28 May 2020 20:51:07 +0800 Subject: [PATCH 15/45] fixed release notes v0.3.8 --- lib/desktop_updater.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 4b231460e..31657976c 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -183,11 +183,19 @@ function showReleaseNotes(type, msgJSON) { var releaseNotesVersions = Object.keys(releaseNotes); console.log('[DTU]', 'releaseNotesVersions : ',releaseNotesVersions) if(msgJSON.upgrade){ - releaseNotesVersions = [msgJSON.version]; - console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade,releaseNotesVersions) - console.log('[DTU]', 'msgJSON.upgrade:',releaseNotes[msgJSON.version],msgJSON.notes) - releaseNotes[msgJSON.version] = {}; - releaseNotes[msgJSON.version]["content"] = msgJSON.notes; + + var app_ver_split = process.env.currentVersion.split('.'); + + if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ + releaseNotesVersions = [msgJSON.version]; + console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade,releaseNotesVersions) + console.log('[DTU]', 'msgJSON.upgrade:',releaseNotes[msgJSON.version],msgJSON.notes) + releaseNotes[msgJSON.version] = {}; + releaseNotes[msgJSON.version]["content"] = msgJSON.notes; + }else{ + releaseNotesVersions = [msgJSON.version]; + + } }else{ releaseNotesVersions = releaseNotesVersions.slice(releaseNotesVersions.indexOf(msgJSON.currentVersion)); console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade, releaseNotesVersions) -- GitLab From 7405d5dd49c7169bbafc7b38337f5964095f5d11 Mon Sep 17 00:00:00 2001 From: akashtl Date: Fri, 29 May 2020 17:51:30 +0800 Subject: [PATCH 16/45] event electron-latest-version added and menu updated in SPA --- lib/desktop_updater.js | 24 +++++++++++++++++++++++- src/containers/ActionMenu/ActionMenu.js | 4 ++-- src/root.js | 12 ++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 31657976c..071ed5951 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -562,7 +562,29 @@ if (process.env.currentVersion) { */ var app_ver_split = process.env.currentVersion.split('.'); if(app_ver_split[0]!=='0'|| parseInt(app_ver_split[1])>3){ - getAppVesrion(); + /* + * Listerner to receive latest version + * Send this information to native app to show + */ + document.addEventListener('electron-latest-version', function (e) { + try { + console.log('[DTU]', 'latest-version DATA', e.data); + var version_data = e.data; + if (version_data) { + console.log('[DTU]', 'latest-version', 'if condition', process.env.currentBuild); + if(process.env.currentBuild===0) { + process.env.currentBuild = version_data.buildNumber; + } + getAppVesrion(); + } else { + console.log('[DTU]', 'latest-version', 'else condition'); + } + } catch (err) { + console.error('[DTU]', 'latest-version err', err); + + } + }); + setInterval(function(){ console.log('[DTU] CHECK APP VERSION AFTER 10 MINS') getAppVesrion(); diff --git a/src/containers/ActionMenu/ActionMenu.js b/src/containers/ActionMenu/ActionMenu.js index eb514591f..d8aee7ea5 100644 --- a/src/containers/ActionMenu/ActionMenu.js +++ b/src/containers/ActionMenu/ActionMenu.js @@ -197,11 +197,11 @@ class LeftMenu extends Component { - + {/* - + */} diff --git a/src/root.js b/src/root.js index 79e1f121c..01b785d31 100644 --- a/src/root.js +++ b/src/root.js @@ -5,9 +5,21 @@ import { syncHistoryWithStore } from 'react-router-redux' import routes from './routes'; import { appInitActions as actions } from './core/resource/app'; +import NynjaCommunicator from './core/SDK/nynjaCommunicator.sdk'; +import constants from './core/configs/Constants.config'; class Root extends Component { componentDidMount() { this.props.store.dispatch(actions.appInit()); + + /*@akash: start call NynjaCommunicator instance for notify trigger to desktop_update listner */ + const facade = NynjaCommunicator.getInstance(); + const data = { + version: constants.version, + buildNumber: constants.buildNumber, + } + facade.notify('electron-latest-version', data); + /*@akash: end call NynjaCommunicator instance for notify trigger desktop_update listner */ + } render() { -- GitLab From eef436a5bdbd6ef6be33fc3487dd2a71602ed8cb Mon Sep 17 00:00:00 2001 From: akashtl Date: Sat, 30 May 2020 16:58:41 +0800 Subject: [PATCH 17/45] appversion updated --- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 56fe24ade..7ff0a44c8 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -88,7 +88,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"1589451878","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"1590746729","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) -- GitLab From 565ef77ac2c518f2bf0228c7c6f3ee490311886c Mon Sep 17 00:00:00 2001 From: akashtl Date: Sat, 30 May 2020 17:32:59 +0800 Subject: [PATCH 18/45] update issue fixed --- lib/desktop_updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 071ed5951..fbb46c994 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -572,7 +572,7 @@ if (process.env.currentVersion) { var version_data = e.data; if (version_data) { console.log('[DTU]', 'latest-version', 'if condition', process.env.currentBuild); - if(process.env.currentBuild===0) { + if(process.env.currentBuild==='0') { process.env.currentBuild = version_data.buildNumber; } getAppVesrion(); -- GitLab From 81b26b9dac564fca3e31c3ff77d3839ab24b06e2 Mon Sep 17 00:00:00 2001 From: jitender Date: Sun, 31 May 2020 13:52:10 +0800 Subject: [PATCH 19/45] join link handling in nginx config --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 27 +++++++++++++++++-- charts/nynja-app-web/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 27 +++++++++++++++++-- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 57 insertions(+), 11 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 35e08ae81..7492ec3d4 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.10 +version: 0.2.11 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 7ff0a44c8..f3d163655 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -56,20 +56,43 @@ data: set $join_link 0; # Handle client type (web|desktop - default is web) set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; - if ( $host ~ ^join\.(?.+)$ ) { + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { set $join_link 1; set $auth_type "off"; + set $env_url "nynja.net"; } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + if ($request_uri ~ ^/.well-known/.*$ ) { set $join_link 0; set $auth_type "off"; } + if ( $http_referer ~* desktop\.(?.+)$ ) { set $client_type "desktop"; } if ($join_link = 1) { - return 302 https://$client_type.$domain/join$request_uri; + return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index a3de6ea60..77e3052b6 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.7 +version: 0.2.8 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index ca5d14eea..c11fc302e 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -56,20 +56,43 @@ data: set $join_link 0; # Handle client type (web|desktop - default is web) set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; - if ( $host ~ ^join\.(?.+)$ ) { + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { set $join_link 1; set $auth_type "off"; + set $env_url "nynja.net"; } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + if ($request_uri ~ ^/.well-known/.*$ ) { set $join_link 0; set $auth_type "off"; } + if ( $http_referer ~* desktop\.(?.+)$ ) { set $client_type "desktop"; } if ($join_link = 1) { - return 302 https://$client_type.$domain/join$request_uri; + return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index e41e04f5d..50ed85106 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.7 + version: 0.2.8 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index f49f1d0d5..4c4831fce 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.10 + version: 0.2.11 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index d3cae4da7..7d66472f1 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.7 + version: 0.2.8 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 3086e4c3b..cbeb37368 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.10 + version: 0.2.11 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index b313316dd..b6cbb458f 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.7 + version: 0.2.8 values: replicaCount: 3 auth: -- GitLab From 463291f929a65bfb995394db1b8a0c1aed47d5e3 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 14:24:37 +0800 Subject: [PATCH 20/45] changed buildNumber to version for web update --- lib/desktop_updater.js | 32 ++++++++++++++++++++--- lib/releaseNotes/releaseNotesDesktop.json | 6 ++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 071ed5951..d925f8cea 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -572,8 +572,9 @@ if (process.env.currentVersion) { var version_data = e.data; if (version_data) { console.log('[DTU]', 'latest-version', 'if condition', process.env.currentBuild); - if(process.env.currentBuild===0) { - process.env.currentBuild = version_data.buildNumber; + if(process.env.currentBuild==='0') { + process.env.currentBuild = version_data.version; + // process.env.currentBuild = version_data.buildNumber; } getAppVesrion(); } else { @@ -628,11 +629,34 @@ if (process.env.currentVersion) { // }; console.log('[DTU] current build',process.env.currentBuild); - console.log('[DTU] appversionObj.currentBuild > process.env.currentBuild',(appversionObj.currentBuild > parseInt(process.env.currentBuild))); + // console.log('[DTU] appversionObj.currentBuild > process.env.currentBuild',(appversionObj.currentBuild > parseInt(process.env.currentBuild))); if(process.env.currentBuild){ - if(appversionObj.build > parseInt(process.env.currentBuild)) { + var api_build_split = appversionObj.build.split('.'); + var app_env_curr_build_split = process.env.currentBuild.split('.'); + // if(appversionObj.build > parseInt(process.env.currentBuild)) { + // isBuildUpdate = true; + // } + console.log('[DTU] check build major ',api_build_split[0],'>',app_env_curr_build_split[0]); + console.log('[DTU] check build minor ',api_build_split[1],'>',app_env_curr_build_split[1]); + console.log('[DTU] check build patch ',api_build_split[2],'>',app_env_curr_build_split[2]); + // check major + if(parseInt(api_build_split[0])>parseInt(app_env_curr_build_split[0])){ isBuildUpdate = true; + }else{ + // check minor + if(parseInt(api_build_split[1])>parseInt(app_env_curr_build_split[1])){ + isBuildUpdate = true; + }else{ + // check patch + if(parseInt(api_build_split[2])>parseInt(app_env_curr_build_split[2])){ + isBuildUpdate = true; + }else{ + + isBuildUpdate = false; + } + } } + } console.log('[DTU] current version',process.env.currentVersion); if(process.env.currentVersion){ diff --git a/lib/releaseNotes/releaseNotesDesktop.json b/lib/releaseNotes/releaseNotesDesktop.json index f90059a8f..5f5c74a9a 100644 --- a/lib/releaseNotes/releaseNotesDesktop.json +++ b/lib/releaseNotes/releaseNotesDesktop.json @@ -1,11 +1,11 @@ { "0.4.1": { - "1589451878": [ + "0.34.0": [ "Stability improvements" ] }, "0.4.0": { - "1589451878": [ + "0.34.0": [ "Electron Framework updated to latest version 8.0.1", "Fixed select all keyboard shortcut (command + A) issue in Mac OS", "Handled mic and camera permission issue on Mac OS", @@ -19,7 +19,7 @@ ] }, "0.3.8": { - "1589451878": [ + "content": [ "Updated login page design.", "Added download guideline in app update process.", "Added release notes in update popup.", -- GitLab From 4c169156225e9c2f54b05562f9250f32b7203b84 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 14:32:06 +0800 Subject: [PATCH 21/45] nginx api updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 7492ec3d4..1aa6397ba 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.11 +version: 0.2.12 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index f3d163655..b2cc2785e 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"1590746729","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 4c4831fce..fbe3b526b 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.11 + version: 0.2.12 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index cbeb37368..d4eeeed08 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.11 + version: 0.2.12 values: replicaCount: 3 auth: -- GitLab From e48fb80fd2663fcda524145d8f8ca9579c85363c Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 15:58:33 +0800 Subject: [PATCH 22/45] update build issue fix --- lib/desktop_updater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index d925f8cea..792a7ebe1 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -693,7 +693,7 @@ if (process.env.currentVersion) { version: appversionObj.version, build: appversionObj.build, currentVersion: process.env.currentVersion, - currentBuild: parseInt(process.env.currentBuild), + currentBuild: (process.env.currentBuild), notes: appversionObj.notes, status: 200 }) -- GitLab From ea296ba63044ea408772d5d95b3b604ae2474f93 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 17:49:56 +0800 Subject: [PATCH 23/45] build number added --- lib/desktop_updater.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 792a7ebe1..3047bddd4 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -191,7 +191,8 @@ function showReleaseNotes(type, msgJSON) { console.log('[DTU]', 'msgJSON.upgrade:',msgJSON.upgrade,releaseNotesVersions) console.log('[DTU]', 'msgJSON.upgrade:',releaseNotes[msgJSON.version],msgJSON.notes) releaseNotes[msgJSON.version] = {}; - releaseNotes[msgJSON.version]["content"] = msgJSON.notes; + releaseNotes[msgJSON.version][msgJSON.build] = msgJSON.notes; + // releaseNotes[msgJSON.version]["content"] = msgJSON.notes; }else{ releaseNotesVersions = [msgJSON.version]; -- GitLab From 4ec71a23c2db531de47b56a4de7ff366718f5922 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 18:25:07 +0800 Subject: [PATCH 24/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 1aa6397ba..e31739a32 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.12 +version: 0.2.13 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index b2cc2785e..3af657fbb 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.1","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index fbe3b526b..9fb0c71ec 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.12 + version: 0.2.13 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index d4eeeed08..4bfe8679b 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.12 + version: 0.2.13 values: replicaCount: 3 auth: -- GitLab From 14eba790ee44a9463136438ce63d1d9cdc4158e4 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 19:54:44 +0800 Subject: [PATCH 25/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index e31739a32..7b25ee24e 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.13 +version: 0.2.14 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 3af657fbb..9e230fb3b 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.1","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.1","build":"0.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 9fb0c71ec..7aa68493d 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.13 + version: 0.2.14 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 4bfe8679b..9cf992089 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.13 + version: 0.2.14 values: replicaCount: 3 auth: -- GitLab From 5ae8e15ee0e921d5ff0e13b16143d9acb73df131 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 20:28:40 +0800 Subject: [PATCH 26/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 7b25ee24e..1c996a399 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.14 +version: 0.2.15 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 9e230fb3b..3aea8af7d 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.1","build":"0.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"0.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 7aa68493d..763598d43 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.14 + version: 0.2.15 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 9cf992089..33925458a 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.14 + version: 0.2.15 values: replicaCount: 3 auth: -- GitLab From 87714b5d5563f65976ef1051309635f40cd6a612 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 21:29:13 +0800 Subject: [PATCH 27/45] refresh only 2 button issue fix --- lib/desktop_updater.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 3047bddd4..ad99484a3 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -266,6 +266,8 @@ function updateVersionNotesClick() { function updateInfoClick(msgJSON) { //show modal popup document.getElementById('update-desc-box').style = ''; + document.getElementById('update_download_install').style = 'display: none;'; + document.getElementById('update_refresh_only').style = 'display: none;'; console.log(msgJSON) if (msgJSON.upgrade) { // // // document.getElementById('update-install').removeEventListener('click'); @@ -283,10 +285,10 @@ function updateInfoClick(msgJSON) { }else{ // alert(2) - document.getElementById('update_download_install').innerHTML = 'Refresh Only'; + // document.getElementById('update_download_install').innerHTML = 'Refresh Only'; document.getElementById('update_refresh_only').style = ''; document.getElementById('update_refresh_only').addEventListener("click", startDownloading) - document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; + // document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; } }else{ -- GitLab From 06d6d272bf422a7b75999cf06ea58db5fd6663c0 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 22:00:56 +0800 Subject: [PATCH 28/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- lib/desktop_updater.js | 5 +++-- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 1c996a399..e91406d43 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.15 +version: 0.2.16 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 3aea8af7d..77ffcee57 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"0.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"1.3.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index ad99484a3..16c881895 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -291,8 +291,9 @@ function updateInfoClick(msgJSON) { // document.getElementById('releases_info_p').innerHTML = 'By clicking on Confirm button, Nynja application will refresh to apply new updates.'; } }else{ - - document.getElementById('update_download_install').style = ''; + + document.getElementById('update_download_install').style = ''; + document.getElementById('releases_info_p').innerHTML = 'After finishing the download, NYNJA application will be restarted to apply new updates.'; document.getElementById('update_download_install').addEventListener("click", updateConfClick) } } diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 763598d43..9f092d11e 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.15 + version: 0.2.16 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 33925458a..5c4c52dfb 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.15 + version: 0.2.16 values: replicaCount: 3 auth: -- GitLab From 6f00420e76c1d029f8cb2b6251b33ae0502818a8 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 22:46:03 +0800 Subject: [PATCH 29/45] handled update popup --- lib/desktop_updater.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 16c881895..5d4dbf88e 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -90,6 +90,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update_version_nodejs').innerHTML = (msgJSON.nodejs === undefined ? process.versions.node : msgJSON.chromium); document.getElementById('update-desc-box').style = 'display: none;'; + document.getElementById('update-desc-release-notes').style = 'display: none;'; // document.getElementById('update-info').style = 'display: none;'; document.getElementById('update-conf-box').style = 'display: none;'; document.getElementById('update-conf-yes').style = 'display: none;'; @@ -133,6 +134,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-desc-box').style = 'display: none;'; + document.getElementById('update-desc-release-notes').style = 'display: none;'; // document.getElementById('update-info').style = 'display: none;'; document.getElementById('update-conf-box').style = 'display: none;'; document.getElementById('update-conf-yes').style = 'display: none;'; -- GitLab From dbc426ded9e71f2d7552ab5ee0f71283cf13b656 Mon Sep 17 00:00:00 2001 From: akashtl Date: Mon, 1 Jun 2020 23:29:16 +0800 Subject: [PATCH 30/45] removed build check --- lib/desktop_updater.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index 5d4dbf88e..e753c7e89 100755 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -578,10 +578,10 @@ if (process.env.currentVersion) { var version_data = e.data; if (version_data) { console.log('[DTU]', 'latest-version', 'if condition', process.env.currentBuild); - if(process.env.currentBuild==='0') { + // if(process.env.currentBuild==='0') { process.env.currentBuild = version_data.version; // process.env.currentBuild = version_data.buildNumber; - } + // } getAppVesrion(); } else { console.log('[DTU]', 'latest-version', 'else condition'); @@ -699,7 +699,7 @@ if (process.env.currentVersion) { version: appversionObj.version, build: appversionObj.build, currentVersion: process.env.currentVersion, - currentBuild: (process.env.currentBuild), + currentBuild: process.env.currentBuild, notes: appversionObj.notes, status: 200 }) -- GitLab From 8bc2ca106b22b03d98fa47c00859d00480eef3f9 Mon Sep 17 00:00:00 2001 From: akashtl Date: Tue, 2 Jun 2020 00:05:09 +0800 Subject: [PATCH 31/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index e91406d43..f82a8019e 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.16 +version: 0.2.17 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 77ffcee57..735bce6d1 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"1.3.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"1.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 9f092d11e..44cbef94c 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.16 + version: 0.2.17 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 5c4c52dfb..6e2704770 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.16 + version: 0.2.17 values: replicaCount: 3 auth: -- GitLab From 9ddd013a9286a62922e0605719cbee7c3d14c56a Mon Sep 17 00:00:00 2001 From: akashtl Date: Tue, 2 Jun 2020 00:27:18 +0800 Subject: [PATCH 32/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index f82a8019e..00447d919 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.17 +version: 0.2.18 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 735bce6d1..3aea8af7d 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"1.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"0.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 44cbef94c..706ca04dc 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.17 + version: 0.2.18 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 6e2704770..51107e862 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.17 + version: 0.2.18 values: replicaCount: 3 auth: -- GitLab From e09d01b174772ba1cc85b2d6fecb187bd024d6ce Mon Sep 17 00:00:00 2001 From: akashtl Date: Tue, 2 Jun 2020 10:08:34 +0800 Subject: [PATCH 33/45] api appversion updated --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 00447d919..8d3940d5d 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.18 +version: 0.2.19 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 3aea8af7d..b2cc2785e 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -111,7 +111,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"0.34.1","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 706ca04dc..219977cc4 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.18 + version: 0.2.19 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 51107e862..558abb377 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.18 + version: 0.2.19 values: replicaCount: 3 auth: -- GitLab From 742e1d10aef0ed5ce612d474e8775e3dd12d1a5c Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Tue, 2 Jun 2020 10:11:15 +0530 Subject: [PATCH 34/45] Updated and Variablized Nginx Config --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 146 +---------------- charts/nynja-app-desktop/values.yaml | 147 ++++++++++++++++++ charts/nynja-app-web/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 140 +---------------- charts/nynja-app-web/values.yaml | 141 +++++++++++++++++ releases/dev/nynja-app-web.yaml | 142 ++++++++++++++++- releases/prod/nynja-app-desktop.yaml | 142 ++++++++++++++++- releases/prod/nynja-app-web.yaml | 142 ++++++++++++++++- releases/staging/nynja-app-desktop.yaml | 142 ++++++++++++++++- releases/staging/nynja-app-web.yaml | 142 ++++++++++++++++- 11 files changed, 997 insertions(+), 291 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 8d3940d5d..37ed33f35 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.19 +version: 0.2.20 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index b2cc2785e..4dbf5598a 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -8,148 +8,4 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - default.conf: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 302 https://$client_type.$env_url/join$request_uri; - #return 302 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - location /appversion { - auth_basic off; - default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } + default.conf: {{ .Values.nginx.data }} diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml index 2ada0569f..cae57ba4e 100644 --- a/charts/nynja-app-desktop/values.yaml +++ b/charts/nynja-app-desktop/values.yaml @@ -44,3 +44,150 @@ nodeSelector: {} tolerations: [] affinity: {} + +nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + location /appversion { + auth_basic off; + default_type application/json; + return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } \ No newline at end of file diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 77e3052b6..9a576b69e 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.8 +version: 0.2.9 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index c11fc302e..d778e83e3 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -8,142 +8,4 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - default.conf: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 302 https://$client_type.$env_url/join$request_uri; - #return 302 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } + default.conf: {{ .Values.nginx.data }} diff --git a/charts/nynja-app-web/values.yaml b/charts/nynja-app-web/values.yaml index 957d07eb2..f80ec1367 100644 --- a/charts/nynja-app-web/values.yaml +++ b/charts/nynja-app-web/values.yaml @@ -44,3 +44,144 @@ nodeSelector: {} tolerations: [] affinity: {} + +nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 50ed85106..008cf869c 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.8 + version: 0.2.9 values: replicaCount: 1 auth: @@ -32,3 +32,143 @@ spec: confcall: service: calling-service.callconf.svc.cluster.local historyService: calling-service-history.callconf.svc.cluster.local + nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 301 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } \ No newline at end of file diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 219977cc4..8cfccdb58 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.19 + version: 0.2.20 values: replicaCount: 3 auth: @@ -32,3 +32,143 @@ spec: confcall: service: calling-service.callconf.svc.cluster.local historyService: calling-service-history.callconf.svc.cluster.local + nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 301 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } \ No newline at end of file diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 7d66472f1..ebd89b6d1 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.8 + version: 0.2.9 values: replicaCount: 3 auth: @@ -32,3 +32,143 @@ spec: confcall: service: calling-service.callconf.svc.cluster.local historyService: calling-service-history.callconf.svc.cluster.local + nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 301 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } \ No newline at end of file diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 558abb377..f7dc77dc8 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.19 + version: 0.2.20 values: replicaCount: 3 auth: @@ -32,3 +32,143 @@ spec: confcall: service: calling-service.callconf.svc.cluster.local historyService: calling-service-history.callconf.svc.cluster.local + nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 301 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index b6cbb458f..7022e513f 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.8 + version: 0.2.9 values: replicaCount: 3 auth: @@ -32,3 +32,143 @@ spec: confcall: service: calling-service.callconf.svc.cluster.local historyService: calling-service-history.callconf.svc.cluster.local + nginx: + data: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 301 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } \ No newline at end of file -- GitLab From 322243b8901aab882a5048fcb0d75d33971eaba9 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Tue, 2 Jun 2020 12:13:07 +0530 Subject: [PATCH 35/45] Updated return code for Nginx config to 301 --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 146 ++++++++++++++++- charts/nynja-app-desktop/values.yaml | 147 ------------------ charts/nynja-app-web/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 141 ++++++++++++++++- charts/nynja-app-web/values.yaml | 141 ----------------- releases/dev/nynja-app-web.yaml | 144 +---------------- releases/prod/nynja-app-desktop.yaml | 144 +---------------- releases/prod/nynja-app-web.yaml | 144 +---------------- releases/staging/nynja-app-desktop.yaml | 144 +---------------- releases/staging/nynja-app-web.yaml | 144 +---------------- 11 files changed, 297 insertions(+), 1002 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 37ed33f35..6e7214b53 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.20 +version: 0.2.21 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 4dbf5598a..c67c39799 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -8,4 +8,148 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - default.conf: {{ .Values.nginx.data }} + default.conf: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + location /appversion { + auth_basic off; + default_type application/json; + return 200 '{"status":"success","version":"0.4.0","build":"1589451878","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } \ No newline at end of file diff --git a/charts/nynja-app-desktop/values.yaml b/charts/nynja-app-desktop/values.yaml index cae57ba4e..2ada0569f 100644 --- a/charts/nynja-app-desktop/values.yaml +++ b/charts/nynja-app-desktop/values.yaml @@ -44,150 +44,3 @@ nodeSelector: {} tolerations: [] affinity: {} - -nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 302 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - location /appversion { - auth_basic off; - default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } \ No newline at end of file diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 9a576b69e..1d3cfa477 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.9 +version: 0.2.10 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index d778e83e3..f8158bcdd 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -8,4 +8,143 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - default.conf: {{ .Values.nginx.data }} + default.conf: |- + server { + listen 80; + server_name _; + + #sendfile on; + sendfile off; + sendfile_max_chunk 1m; + + tcp_nopush on; + tcp_nodelay off; + + charset utf-8; + access_log off; + #access_log /var/log/nginx/host.access.log main; + + # GZIP settings + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 5; + gzip_buffers 16 4k; + gzip_min_length 256; + gzip_types + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + text/plain + text/css + text/javascript + text/xml + image/jpeg + image/png + image/gif; + + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri /index.html; + + set $auth_type "Restricted"; + # Handle join links (ex. join.nynja.net/123) + set $join_link 0; + # Handle client type (web|desktop - default is web) + set $client_type "web"; + # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") + set $env_url ""; + + #if ( $host ~ ^join\.(?.+)$ ) { + # set $join_link 1; + # set $auth_type "off"; + #} + + # Detect join link with prod url + if ( $host ~ ^join\.nynja\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "nynja.net"; + } + # Detect join link with staging url + if ( $host ~ ^join\.staging\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "staging.nynja.net"; + } + # Detect join link with dev url + if ( $host ~ ^join\.dev\..+$ ) { + set $join_link 1; + set $auth_type "off"; + set $env_url "dev.nynja.net"; + } + + if ($request_uri ~ ^/.well-known/.*$ ) { + set $join_link 0; + set $auth_type "off"; + } + + if ( $http_referer ~* desktop\.(?.+)$ ) { + set $client_type "desktop"; + } + if ($join_link = 1) { + return 301 https://$client_type.$env_url/join$request_uri; + #return 302 https://web.$domain/join$request_uri; + #return 302 https://desktop.$domain/join$request_uri; + } + + # {{ if .Values.auth.basic.enabled }} + auth_basic $auth_type; + auth_basic_user_file /usr/share/nginx/html/.htpasswd; + # {{ end }} + } + + location /status { + auth_basic off; + return 200; + } + + # Webpack debug proxy (temporary) + #location /debug { + # proxy_set_header X-Forwarded-For $remote_addr; + # proxy_set_header Host $http_host; + # proxy_pass "http://127.0.0.1:8080"; + #} + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + #error_page 500 502 503 504 /50x.html; + #location = /50x.html { + # root /usr/share/nginx/html; + #} + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + location ~ /\.ht { + deny all; + } + } + diff --git a/charts/nynja-app-web/values.yaml b/charts/nynja-app-web/values.yaml index f80ec1367..957d07eb2 100644 --- a/charts/nynja-app-web/values.yaml +++ b/charts/nynja-app-web/values.yaml @@ -44,144 +44,3 @@ nodeSelector: {} tolerations: [] affinity: {} - -nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 302 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 008cf869c..616756079 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.9 + version: 0.2.10 values: replicaCount: 1 auth: @@ -31,144 +31,4 @@ spec: host: messaging-service.messaging.svc.cluster.local confcall: service: calling-service.callconf.svc.cluster.local - historyService: calling-service-history.callconf.svc.cluster.local - nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 301 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } \ No newline at end of file + historyService: calling-service-history.callconf.svc.cluster.local \ No newline at end of file diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 8cfccdb58..4b60c1b08 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.20 + version: 0.2.21 values: replicaCount: 3 auth: @@ -31,144 +31,4 @@ spec: host: messaging-service.messaging.svc.cluster.local confcall: service: calling-service.callconf.svc.cluster.local - historyService: calling-service-history.callconf.svc.cluster.local - nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 301 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } \ No newline at end of file + historyService: calling-service-history.callconf.svc.cluster.local \ No newline at end of file diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index ebd89b6d1..96e5a5722 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.9 + version: 0.2.10 values: replicaCount: 3 auth: @@ -31,144 +31,4 @@ spec: host: messaging-service.messaging.svc.cluster.local confcall: service: calling-service.callconf.svc.cluster.local - historyService: calling-service-history.callconf.svc.cluster.local - nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 301 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } \ No newline at end of file + historyService: calling-service-history.callconf.svc.cluster.local \ No newline at end of file diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index f7dc77dc8..1be4aa827 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.20 + version: 0.2.21 values: replicaCount: 3 auth: @@ -31,144 +31,4 @@ spec: host: messaging-service.messaging.svc.cluster.local confcall: service: calling-service.callconf.svc.cluster.local - historyService: calling-service-history.callconf.svc.cluster.local - nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 301 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } + historyService: calling-service-history.callconf.svc.cluster.local \ No newline at end of file diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 7022e513f..2faaa3aff 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.9 + version: 0.2.10 values: replicaCount: 3 auth: @@ -31,144 +31,4 @@ spec: host: messaging-service.messaging.svc.cluster.local confcall: service: calling-service.callconf.svc.cluster.local - historyService: calling-service-history.callconf.svc.cluster.local - nginx: - data: |- - server { - listen 80; - server_name _; - - #sendfile on; - sendfile off; - sendfile_max_chunk 1m; - - tcp_nopush on; - tcp_nodelay off; - - charset utf-8; - access_log off; - #access_log /var/log/nginx/host.access.log main; - - # GZIP settings - gzip on; - gzip_disable "msie6"; - gzip_vary on; - gzip_proxied any; - gzip_comp_level 5; - gzip_buffers 16 4k; - gzip_min_length 256; - gzip_types - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - text/plain - text/css - text/javascript - text/xml - image/jpeg - image/png - image/gif; - - location / { - root /usr/share/nginx/html; - index index.html; - try_files $uri /index.html; - - set $auth_type "Restricted"; - # Handle join links (ex. join.nynja.net/123) - set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; - - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - - if ($request_uri ~ ^/.well-known/.*$ ) { - set $join_link 0; - set $auth_type "off"; - } - - if ( $http_referer ~* desktop\.(?.+)$ ) { - set $client_type "desktop"; - } - if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; - #return 301 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - } - - # {{ if .Values.auth.basic.enabled }} - auth_basic $auth_type; - auth_basic_user_file /usr/share/nginx/html/.htpasswd; - # {{ end }} - } - - location /status { - auth_basic off; - return 200; - } - - # Webpack debug proxy (temporary) - #location /debug { - # proxy_set_header X-Forwarded-For $remote_addr; - # proxy_set_header Host $http_host; - # proxy_pass "http://127.0.0.1:8080"; - #} - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - #error_page 500 502 503 504 /50x.html; - #location = /50x.html { - # root /usr/share/nginx/html; - #} - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - location ~ /\.ht { - deny all; - } - } \ No newline at end of file + historyService: calling-service-history.callconf.svc.cluster.local \ No newline at end of file -- GitLab From 7fa2d35205c7eab585a56d3b86ccef006ff41d59 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Tue, 2 Jun 2020 13:21:53 +0530 Subject: [PATCH 36/45] Added HSTS Header to Nginx Config --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 1 + charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 1 + releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 6e7214b53..53efaf9ef 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.21 +version: 0.2.22 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index c67c39799..2b1c05c77 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -12,6 +12,7 @@ data: server { listen 80; server_name _; + add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; #sendfile on; sendfile off; diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 1d3cfa477..8fe7d6289 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.10 +version: 0.2.11 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index f8158bcdd..96c9ee97f 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -12,6 +12,7 @@ data: server { listen 80; server_name _; + add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; #sendfile on; sendfile off; diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 616756079..b333681c1 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.10 + version: 0.2.11 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 4b60c1b08..b177f860f 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.21 + version: 0.2.22 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 96e5a5722..4e1ceefaf 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.10 + version: 0.2.11 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 1be4aa827..3e6959bac 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.21 + version: 0.2.22 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 2faaa3aff..60263e92e 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.10 + version: 0.2.11 values: replicaCount: 3 auth: -- GitLab From 5538be1261afe1c4529c7aaf65dd0b82dd4c7630 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Tue, 2 Jun 2020 14:20:20 +0530 Subject: [PATCH 37/45] Rollbacked to nginx return code 302 --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 2 +- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 53efaf9ef..c25ac10cd 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.22 +version: 0.2.23 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 2b1c05c77..7b54ffeb8 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -93,7 +93,7 @@ data: set $client_type "desktop"; } if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; + return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 8fe7d6289..f96cfb6f8 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.11 +version: 0.2.12 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 96c9ee97f..4367c87de 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -93,7 +93,7 @@ data: set $client_type "desktop"; } if ($join_link = 1) { - return 301 https://$client_type.$env_url/join$request_uri; + return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index b333681c1..49ac30e55 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.11 + version: 0.2.12 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index b177f860f..9a2e5dc0d 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.22 + version: 0.2.23 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 4e1ceefaf..7c4971762 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.11 + version: 0.2.12 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 3e6959bac..46e27713d 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.22 + version: 0.2.23 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 60263e92e..9498a3139 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.11 + version: 0.2.12 values: replicaCount: 3 auth: -- GitLab From 12cef478eec1271eead179fc02f340567b3292b8 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Tue, 2 Jun 2020 14:55:36 +0530 Subject: [PATCH 38/45] Updated listen 443 and removed HSTS --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 2 +- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index c25ac10cd..0ce7a9b0d 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.23 +version: 0.2.24 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 7b54ffeb8..42e07229d 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -11,8 +11,8 @@ data: default.conf: |- server { listen 80; + listen 443 ssl; server_name _; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; #sendfile on; sendfile off; diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index f96cfb6f8..09b61d22e 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.12 +version: 0.2.13 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 4367c87de..226d72bf2 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -11,8 +11,8 @@ data: default.conf: |- server { listen 80; + listen 443 ssl; server_name _; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; #sendfile on; sendfile off; diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 49ac30e55..3f5ee5865 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.12 + version: 0.2.13 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 9a2e5dc0d..7bdef855a 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.23 + version: 0.2.24 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 7c4971762..52c820915 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.12 + version: 0.2.13 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 46e27713d..84bd5b515 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.23 + version: 0.2.24 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 9498a3139..53bb1bef7 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.12 + version: 0.2.13 values: replicaCount: 3 auth: -- GitLab From 33ee94de695214c65b06f7189bd0f1d40377fe5f Mon Sep 17 00:00:00 2001 From: akashtl Date: Tue, 2 Jun 2020 20:30:57 +0800 Subject: [PATCH 39/45] appversion api data corrected --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 0ce7a9b0d..1c82b2c29 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.24 +version: 0.2.25 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 42e07229d..e7400bc25 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -112,7 +112,7 @@ data: location /appversion { auth_basic off; default_type application/json; - return 200 '{"status":"success","version":"0.4.0","build":"1589451878","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; + return 200 '{"status":"success","version":"0.4.0","build":"0.34.0","notes":["Electron Framework updated to latest version 8.0.1","Fixed select all keyboard shortcut (command + A) issue in Mac OS","Handled mic and camera permission issue on Mac OS","Handled black thumbnails in screen share popup on Windows OS","Updated spellcheck feature with stable library","Fixed cancel button issue in Print dialog of Pdf Viewer","Fullscreen and close button issue fixed in Pdf viewer","Added single process for upgrading web and native app upgrade","Seperated Codebase for native application","Fixed screen share and invite link issue for full screenshare dialog"]}'; } # Webpack debug proxy (temporary) diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 7bdef855a..27a0e5346 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.24 + version: 0.2.25 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 84bd5b515..6ccd51d7b 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.24 + version: 0.2.25 values: replicaCount: 3 auth: -- GitLab From 84bd850cc03f91339fd7efa4fd4097be42946532 Mon Sep 17 00:00:00 2001 From: jitender Date: Tue, 2 Jun 2020 22:48:36 +0800 Subject: [PATCH 40/45] replcaed return 302 to proxy_pass (chart: web 0.2.14 & desktop 0.2.26 --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 4 ++-- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 4 ++-- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 1c82b2c29..bb5df0dbe 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.25 +version: 0.2.26 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index e7400bc25..210244279 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -11,7 +11,6 @@ data: default.conf: |- server { listen 80; - listen 443 ssl; server_name _; #sendfile on; @@ -93,7 +92,8 @@ data: set $client_type "desktop"; } if ($join_link = 1) { - return 302 https://$client_type.$env_url/join$request_uri; + proxy_pass https://$client_type.$env_url/join$request_uri; + #return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 09b61d22e..48ad81c0a 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.13 +version: 0.2.14 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 226d72bf2..17a68af94 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -11,7 +11,6 @@ data: default.conf: |- server { listen 80; - listen 443 ssl; server_name _; #sendfile on; @@ -93,7 +92,8 @@ data: set $client_type "desktop"; } if ($join_link = 1) { - return 302 https://$client_type.$env_url/join$request_uri; + proxy_pass https://$client_type.$env_url/join$request_uri; + #return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; } diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 3f5ee5865..4a10dabf0 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.13 + version: 0.2.14 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 27a0e5346..69213223d 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.25 + version: 0.2.26 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 52c820915..981b33b8b 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.13 + version: 0.2.14 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 6ccd51d7b..8ee91b209 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.25 + version: 0.2.26 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 53bb1bef7..80e237395 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.13 + version: 0.2.14 values: replicaCount: 3 auth: -- GitLab From 0bd7b18c0fca06ca1b721b6b5c48554865e58f69 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Wed, 3 Jun 2020 10:50:16 +0530 Subject: [PATCH 41/45] Updated Nginx Config for Join Link --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 34 +++++-------------- charts/nynja-app-web/Chart.yaml | 2 +- .../templates/nginx-configmap.yaml | 32 +++-------------- releases/dev/nynja-app-web.yaml | 3 +- releases/prod/nynja-app-desktop.yaml | 3 +- releases/prod/nynja-app-web.yaml | 3 +- releases/staging/nynja-app-desktop.yaml | 3 +- releases/staging/nynja-app-web.yaml | 3 +- 9 files changed, 21 insertions(+), 64 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index bb5df0dbe..35bb9edcc 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.26 +version: 0.2.27 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 210244279..198ba1eb7 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -59,44 +59,28 @@ data: # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") set $env_url ""; - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "nynja.net"; - } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { + if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; set $auth_type "off"; - set $env_url "dev.nynja.net"; } - + if ($request_uri ~ ^/.well-known/.*$ ) { set $join_link 0; set $auth_type "off"; } - - if ( $http_referer ~* desktop\.(?.+)$ ) { + + if ( $http_referer ~ desktop\..+ ) { set $client_type "desktop"; } if ($join_link = 1) { - proxy_pass https://$client_type.$env_url/join$request_uri; + return 302 https://$client_type.$domain/join$request_uri; + } + + #proxy_pass https://$client_type.$env_url/join$request_uri; #return 302 https://$client_type.$env_url/join$request_uri; #return 302 https://web.$domain/join$request_uri; #return 302 https://desktop.$domain/join$request_uri; - } + # {{ if .Values.auth.basic.enabled }} auth_basic $auth_type; diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 48ad81c0a..1cd65d5e1 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.14 +version: 0.2.15 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 17a68af94..e77ad639a 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -59,43 +59,21 @@ data: # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") set $env_url ""; - #if ( $host ~ ^join\.(?.+)$ ) { - # set $join_link 1; - # set $auth_type "off"; - #} - - # Detect join link with prod url - if ( $host ~ ^join\.nynja\..+$ ) { + if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; set $auth_type "off"; - set $env_url "nynja.net"; } - # Detect join link with staging url - if ( $host ~ ^join\.staging\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "staging.nynja.net"; - } - # Detect join link with dev url - if ( $host ~ ^join\.dev\..+$ ) { - set $join_link 1; - set $auth_type "off"; - set $env_url "dev.nynja.net"; - } - + if ($request_uri ~ ^/.well-known/.*$ ) { set $join_link 0; set $auth_type "off"; } - - if ( $http_referer ~* desktop\.(?.+)$ ) { + + if ( $http_referer ~ desktop\..+ ) { set $client_type "desktop"; } if ($join_link = 1) { - proxy_pass https://$client_type.$env_url/join$request_uri; - #return 302 https://$client_type.$env_url/join$request_uri; - #return 302 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; + return 302 https://$client_type.$domain/join$request_uri; } # {{ if .Values.auth.basic.enabled }} diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 4a10dabf0..43d89581c 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.14 + version: 0.2.15 values: replicaCount: 1 auth: @@ -23,7 +23,6 @@ spec: - api-gateway.default.svc.cluster.local hosts: - web.dev.nynja.net - - join.dev.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.dev.mobile.communicator diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 69213223d..6a4f7d652 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.26 + version: 0.2.27 values: replicaCount: 3 auth: @@ -23,7 +23,6 @@ spec: - api-gateway.default.svc.cluster.local hosts: - desktop.nynja.net - - join.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.mobile.communicator diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 981b33b8b..bbacbc2e2 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.14 + version: 0.2.15 values: replicaCount: 3 auth: @@ -23,7 +23,6 @@ spec: - api-gateway.default.svc.cluster.local hosts: - web.nynja.net - - join.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.mobile.communicator diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 8ee91b209..a88e467d1 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.26 + version: 0.2.27 values: replicaCount: 3 auth: @@ -23,7 +23,6 @@ spec: - api-gateway.default.svc.cluster.local hosts: - desktop.staging.nynja.net - - join.staging.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.rc.mobile.communicator diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 80e237395..224c3b5f8 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.14 + version: 0.2.15 values: replicaCount: 3 auth: @@ -23,7 +23,6 @@ spec: - api-gateway.default.svc.cluster.local hosts: - web.staging.nynja.net - - join.staging.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.rc.mobile.communicator -- GitLab From 1f40e80edb255f3cd20cc2d1f55198f9cb9119d7 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Thu, 4 Jun 2020 12:39:46 +0530 Subject: [PATCH 42/45] Added uri settings for nginx configmap --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 2 +- charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 2 +- releases/dev/nynja-app-web.yaml | 2 +- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 35bb9edcc..d2aca8929 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.27 +version: 0.2.28 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 198ba1eb7..40ee422b2 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -49,7 +49,7 @@ data: location / { root /usr/share/nginx/html; index index.html; - try_files $uri /index.html; + try_files $uri $uri/ /index.html; set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 1cd65d5e1..88ac13cea 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.15 +version: 0.2.16 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index e77ad639a..9152a724b 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -49,7 +49,7 @@ data: location / { root /usr/share/nginx/html; index index.html; - try_files $uri /index.html; + try_files $uri $uri/ /index.html; set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index 43d89581c..ed85ee417 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.15 + version: 0.2.16 values: replicaCount: 1 auth: diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 6a4f7d652..4e9eb4815 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.27 + version: 0.2.28 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index bbacbc2e2..3e0217ff5 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.15 + version: 0.2.16 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index a88e467d1..5065d2a49 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.27 + version: 0.2.28 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index 224c3b5f8..bb91c29ff 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.15 + version: 0.2.16 values: replicaCount: 3 auth: -- GitLab From c2b793e89a03d412ce09ce3d96d330799717d71e Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Thu, 4 Jun 2020 14:27:30 +0530 Subject: [PATCH 43/45] Added Referrer block to nested --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 8 +++++--- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index d2aca8929..b91747b75 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.28 +version: 0.2.29 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 40ee422b2..3dc92a8a3 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -69,10 +69,12 @@ data: set $auth_type "off"; } - if ( $http_referer ~ desktop\..+ ) { - set $client_type "desktop"; - } + + if ($join_link = 1) { + if ( $http_referer ~ desktop\..+ ) { + set $client_type "desktop"; + } return 302 https://$client_type.$domain/join$request_uri; } diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 4e9eb4815..ad5be8178 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.28 + version: 0.2.29 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 5065d2a49..6867a7c5a 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.28 + version: 0.2.29 values: replicaCount: 3 auth: -- GitLab From 35a4bcbbdc408c14ee6891f965f6ef7ed251fd40 Mon Sep 17 00:00:00 2001 From: Chetan Rathore Date: Thu, 4 Jun 2020 15:26:51 +0530 Subject: [PATCH 44/45] udpated the return url for nginx --- charts/nynja-app-desktop/Chart.yaml | 2 +- charts/nynja-app-desktop/templates/nginx-configmap.yaml | 5 +---- releases/prod/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-desktop.yaml | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index b91747b75..91d7faa4b 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.29 +version: 0.2.30 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 3dc92a8a3..4957781d2 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -72,10 +72,7 @@ data: if ($join_link = 1) { - if ( $http_referer ~ desktop\..+ ) { - set $client_type "desktop"; - } - return 302 https://$client_type.$domain/join$request_uri; + return 302 https://desktop.$domain/join$request_uri; } #proxy_pass https://$client_type.$env_url/join$request_uri; diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index ad5be8178..3993391e8 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.29 + version: 0.2.30 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index 6867a7c5a..c23cea2f0 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.29 + version: 0.2.30 values: replicaCount: 3 auth: -- GitLab From eac1db33730092aeead967e32edf6402f02e7a68 Mon Sep 17 00:00:00 2001 From: jitender Date: Fri, 5 Jun 2020 16:37:33 +0800 Subject: [PATCH 45/45] updated final nginx config in web and desktop to support join url (chart: web 0.2.17 d7 desktop 0.2.31 --- charts/nynja-app-desktop/Chart.yaml | 2 +- .../nynja-app-desktop/templates/nginx-configmap.yaml | 12 ------------ charts/nynja-app-web/Chart.yaml | 2 +- charts/nynja-app-web/templates/nginx-configmap.yaml | 2 -- releases/dev/nynja-app-web.yaml | 3 ++- releases/prod/nynja-app-desktop.yaml | 2 +- releases/prod/nynja-app-web.yaml | 3 ++- releases/staging/nynja-app-desktop.yaml | 2 +- releases/staging/nynja-app-web.yaml | 3 ++- 9 files changed, 10 insertions(+), 21 deletions(-) diff --git a/charts/nynja-app-desktop/Chart.yaml b/charts/nynja-app-desktop/Chart.yaml index 91d7faa4b..d89cbe5cf 100644 --- a/charts/nynja-app-desktop/Chart.yaml +++ b/charts/nynja-app-desktop/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja desktop application name: nynja-app-desktop -version: 0.2.30 +version: 0.2.31 diff --git a/charts/nynja-app-desktop/templates/nginx-configmap.yaml b/charts/nynja-app-desktop/templates/nginx-configmap.yaml index 4957781d2..fa210ce8f 100644 --- a/charts/nynja-app-desktop/templates/nginx-configmap.yaml +++ b/charts/nynja-app-desktop/templates/nginx-configmap.yaml @@ -54,10 +54,6 @@ data: set $auth_type "Restricted"; # Handle join links (ex. join.nynja.net/123) set $join_link 0; - # Handle client type (web|desktop - default is web) - set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; @@ -68,19 +64,11 @@ data: set $join_link 0; set $auth_type "off"; } - - if ($join_link = 1) { return 302 https://desktop.$domain/join$request_uri; } - #proxy_pass https://$client_type.$env_url/join$request_uri; - #return 302 https://$client_type.$env_url/join$request_uri; - #return 302 https://web.$domain/join$request_uri; - #return 302 https://desktop.$domain/join$request_uri; - - # {{ if .Values.auth.basic.enabled }} auth_basic $auth_type; auth_basic_user_file /usr/share/nginx/html/.htpasswd; diff --git a/charts/nynja-app-web/Chart.yaml b/charts/nynja-app-web/Chart.yaml index 88ac13cea..1f2870887 100644 --- a/charts/nynja-app-web/Chart.yaml +++ b/charts/nynja-app-web/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Deployment of the nynja web application name: nynja-app-web -version: 0.2.16 +version: 0.2.17 diff --git a/charts/nynja-app-web/templates/nginx-configmap.yaml b/charts/nynja-app-web/templates/nginx-configmap.yaml index 9152a724b..28239c62b 100644 --- a/charts/nynja-app-web/templates/nginx-configmap.yaml +++ b/charts/nynja-app-web/templates/nginx-configmap.yaml @@ -56,8 +56,6 @@ data: set $join_link 0; # Handle client type (web|desktop - default is web) set $client_type "web"; - # Handle env url (dev.nynja.net|staging.nynja.net|nynja.net - default is "") - set $env_url ""; if ( $host ~ ^join\.(?.+)$ ) { set $join_link 1; diff --git a/releases/dev/nynja-app-web.yaml b/releases/dev/nynja-app-web.yaml index ed85ee417..8983a8bf3 100644 --- a/releases/dev/nynja-app-web.yaml +++ b/releases/dev/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.16 + version: 0.2.17 values: replicaCount: 1 auth: @@ -23,6 +23,7 @@ spec: - api-gateway.default.svc.cluster.local hosts: - web.dev.nynja.net + - join.dev.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.dev.mobile.communicator diff --git a/releases/prod/nynja-app-desktop.yaml b/releases/prod/nynja-app-desktop.yaml index 3993391e8..86fd54606 100644 --- a/releases/prod/nynja-app-desktop.yaml +++ b/releases/prod/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.30 + version: 0.2.31 values: replicaCount: 3 auth: diff --git a/releases/prod/nynja-app-web.yaml b/releases/prod/nynja-app-web.yaml index 3e0217ff5..ab7ab4c1c 100644 --- a/releases/prod/nynja-app-web.yaml +++ b/releases/prod/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.16 + version: 0.2.17 values: replicaCount: 3 auth: @@ -23,6 +23,7 @@ spec: - api-gateway.default.svc.cluster.local hosts: - web.nynja.net + - join.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.mobile.communicator diff --git a/releases/staging/nynja-app-desktop.yaml b/releases/staging/nynja-app-desktop.yaml index c23cea2f0..fcae183ac 100644 --- a/releases/staging/nynja-app-desktop.yaml +++ b/releases/staging/nynja-app-desktop.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-desktop - version: 0.2.30 + version: 0.2.31 values: replicaCount: 3 auth: diff --git a/releases/staging/nynja-app-web.yaml b/releases/staging/nynja-app-web.yaml index bb91c29ff..bebc8a7aa 100644 --- a/releases/staging/nynja-app-web.yaml +++ b/releases/staging/nynja-app-web.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: nynja-app-web - version: 0.2.16 + version: 0.2.17 values: replicaCount: 3 auth: @@ -23,6 +23,7 @@ spec: - api-gateway.default.svc.cluster.local hosts: - web.staging.nynja.net + - join.staging.nynja.net wellKnown: appleAppSiteAssociation: appId: 9GKQ5AMF2B.com.nynja.rc.mobile.communicator -- GitLab