diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index 15daf4381ddfa3195e999801d509aba4a778cb6c..fd66cf805ef4bc7d5e7bb5e93ee54381015e88f6 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -44,10 +44,6 @@ server {
listen 8080 default_server;
server_name _;
- location = /basic_status {
- stub_status;
- }
-
location /dashboard/ {
rewrite ^/dashboard/(.*) /$1 break;
proxy_set_header Host $host;
diff --git a/helm/dbrepo/files/dbrepo.conf b/helm/dbrepo/files/dbrepo.conf
deleted file mode 100644
index d63eff358f16b5f05ca3912773ffd906f477af14..0000000000000000000000000000000000000000
--- a/helm/dbrepo/files/dbrepo.conf
+++ /dev/null
@@ -1,167 +0,0 @@
-# This is required to proxy Grafana Live WebSocket connections.
-map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
-}
-
-upstream broker {
- server broker-service:15672;
-}
-
-upstream analyse {
- server analyse-service:8080;
-}
-
-upstream data {
- server data-service:8080;
-}
-
-upstream metadata {
- server metadata-service:8080;
-}
-
-upstream search {
- server search-service:8080;
-}
-
-upstream ui {
- server ui:3000;
-}
-
-upstream upload {
- server upload-service:8080;
-}
-
-upstream dashboard-service {
- server dashboard-service:3000;
-}
-
-server {
- listen 8080 default_server;
- server_name _;
-
- location = /basic_status {
- stub_status;
- }
-
- location /dashboard/ {
- rewrite ^/dashboard/(.*) /$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://dashboard-service;
- proxy_read_timeout 90;
- }
-
- # Proxy Grafana Live WebSocket connections.
- location /dashboard/api/live/ {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_http_version 1.1;
- proxy_pass http://dashboard-service;
- proxy_read_timeout 90;
- }
-
- location /api/search {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://search;
- proxy_read_timeout 90;
- }
-
- location /api/upload {
-# allow 128.130.0.0/16;
-# deny all;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Forwarded-Host $host;
- proxy_pass http://upload;
- proxy_read_timeout 90;
- # Disable request and response buffering
- proxy_request_buffering off;
- proxy_buffering off;
- proxy_http_version 1.1;
- }
-
- location /api/analyse {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://analyse;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export) {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://data;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/view/([0-9]+)/(data|export) {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://data;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/view {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/subset {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://data;
- proxy_read_timeout 600;
- }
-
- location ~ /api/(database|concept|container|identifier|image|message|license|oai|ontology|unit|user) {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
- proxy_read_timeout 90;
- }
-
- location ~ /pid/([0-9]+) {
- rewrite /pid/(.*) /api/identifier/$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
- proxy_read_timeout 90;
- }
-
- location / {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://ui;
- proxy_read_timeout 90;
- }
-}
diff --git a/helm/dbrepo/templates/gateway-configmap.yaml b/helm/dbrepo/templates/gateway-configmap.yaml
deleted file mode 100644
index 729320ae72ec8399118004b27feb0b1689c7e3a4..0000000000000000000000000000000000000000
--- a/helm/dbrepo/templates/gateway-configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-{{- if .Values.gatewayservice.enabled }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: gateway-service-config
- namespace: {{ include "common.names.namespace" . | quote }}
-data:
- {{ (.Files.Glob "files/dbrepo.conf").AsConfig | nindent 2 }}
-{{- end }}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index c6393c60ca9b87f2bc345dd58cf20cbe8720e1b0..fb08f447cf332fa28604c8ec182dc8f9444979ec 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -1013,13 +1013,169 @@ gatewayservice:
service:
## @param gatewayservice.service.type The service type.
type: ClusterIP
- ports:
- ## @param gatewayservice.service.ports.http The port for HTTP traffic.
- http: 8080
- ## @param gatewayservice.service.ports.https The port for HTTPS traffic.
- https: 8443
- ## @param gatewayservice.existingServerBlockConfigmap The extra configuration for the reverse proxy
- existingServerBlockConfigmap: gateway-service-config
+ ## @param gatewayservice.serverBlock The extra configuration for the reverse proxy
+ serverBlock: |
+ # This is required to proxy Grafana Live WebSocket connections.
+ map $http_upgrade $connection_upgrade {
+ default upgrade;
+ '' close;
+ }
+
+ upstream broker {
+ server broker-service:15672;
+ }
+
+ upstream analyse {
+ server analyse-service:8080;
+ }
+
+ upstream data {
+ server data-service:8080;
+ }
+
+ upstream metadata {
+ server metadata-service:8080;
+ }
+
+ upstream search {
+ server search-service:8080;
+ }
+
+ upstream ui {
+ server ui:3000;
+ }
+
+ upstream upload {
+ server upload-service:8080;
+ }
+
+ upstream dashboard-service {
+ server dashboard-service:3000;
+ }
+
+ server {
+ listen 8080 default_server;
+ server_name _;
+
+ location /dashboard/ {
+ rewrite ^/dashboard/(.*) /$1 break;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://dashboard-service;
+ proxy_read_timeout 90;
+ }
+
+ # Proxy Grafana Live WebSocket connections.
+ location /dashboard/api/live/ {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+ proxy_http_version 1.1;
+ proxy_pass http://dashboard-service;
+ proxy_read_timeout 90;
+ }
+
+ location /api/search {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://search;
+ proxy_read_timeout 90;
+ }
+
+ location /api/upload {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header X-Forwarded-Host $host;
+ proxy_pass http://upload;
+ proxy_read_timeout 90;
+ # Disable request and response buffering
+ proxy_request_buffering off;
+ proxy_buffering off;
+ proxy_http_version 1.1;
+ }
+
+ location /api/analyse {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://analyse;
+ proxy_read_timeout 90;
+ }
+
+ location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export) {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://data;
+ proxy_read_timeout 90;
+ }
+
+ location ~ /api/database/([0-9]+)/view/([0-9]+)/(data|export) {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://data;
+ proxy_read_timeout 90;
+ }
+
+ location ~ /api/database/([0-9]+)/view {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://metadata;
+ proxy_read_timeout 90;
+ }
+
+ location ~ /api/database/([0-9]+)/subset {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://data;
+ proxy_read_timeout 600;
+ }
+
+ location ~ /api/(database|concept|container|identifier|image|message|license|oai|ontology|unit|user) {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://metadata;
+ proxy_read_timeout 90;
+ }
+
+ location ~ /pid/([0-9]+) {
+ rewrite /pid/(.*) /api/identifier/$1 break;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://metadata;
+ proxy_read_timeout 90;
+ }
+
+ location / {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://ui;
+ proxy_read_timeout 90;
+ }
+ }
## @param gatewayservice.replicaCount The number of replicas.
replicaCount: 3