You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by mi...@apache.org on 2024/08/28 07:39:32 UTC
(incubator-devlake) branch revert-7948 created (now 30f8c58ca)
This is an automated email from the ASF dual-hosted git repository.
mintsweet pushed a change to branch revert-7948
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
at 30f8c58ca Revert "add cloud api proxy (#7948)"
This branch includes the following new commits:
new 30f8c58ca Revert "add cloud api proxy (#7948)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(incubator-devlake) 01/01: Revert "add cloud api proxy (#7948)"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mintsweet pushed a commit to branch revert-7948
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 30f8c58cab859d5fca2ed0c22c2d61d0b4c8eadf
Author: mintsweet <0x...@gmail.com>
AuthorDate: Wed Aug 28 19:38:44 2024 +1200
Revert "add cloud api proxy (#7948)"
This reverts commit 566f61bcebd262c1ddd8aef304da32f268c64da8.
---
config-ui/nginx.conf | 26 --------------------------
config-ui/nginx.sh | 2 +-
2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/config-ui/nginx.conf b/config-ui/nginx.conf
index 7d810010a..959d8bff8 100644
--- a/config-ui/nginx.conf
+++ b/config-ui/nginx.conf
@@ -22,13 +22,9 @@ ${SERVER_CONF}
resolver ${DNS} valid=${DNS_VALID};
resolver_timeout 3s;
set $target "${DEVLAKE_ENDPOINT}";
-
- #https://serverfault.com/questions/459369/disabling-url-decoding-in-nginx-proxy
rewrite ^ $request_uri;
rewrite ^/api/(.*) $1 break;
- # If the second rewrite rule doesn't match, return 400
return 400;
-
proxy_send_timeout 60s;
proxy_read_timeout 60s;
proxy_pass ${DEVLAKE_ENDPOINT_PROTO}://$target/$uri;
@@ -49,28 +45,6 @@ ${SERVER_CONF}
proxy_set_header "Connection" "";
}
- location /cloud-api/ {
- resolver ${DNS} valid=${DNS_VALID};
- resolver_timeout 3s;
-
- set $target "${DEVLAKE_CLOUD_API}";
- if ($target = "") {
- return 503;
- }
-
- #https://serverfault.com/questions/459369/disabling-url-decoding-in-nginx-proxy
- rewrite ^ $request_uri;
- rewrite ^/cloud-api/(.*) $1 break;
- # If the second rewrite rule doesn't match, return 400
- return 400;
-
- proxy_send_timeout 60s;
- proxy_read_timeout 60s;
- proxy_pass $target/$uri;
- proxy_http_version 1.1;
- proxy_set_header "Connection" "";
- }
-
location /grafana/ {
auth_basic off;
set $external "${USE_EXTERNAL_GRAFANA}";
diff --git a/config-ui/nginx.sh b/config-ui/nginx.sh
index e35587a64..3e216b451 100755
--- a/config-ui/nginx.sh
+++ b/config-ui/nginx.sh
@@ -45,7 +45,7 @@ export DNS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"
export DNS_VALID=${DNS_VALID:-300s}
export DEVLAKE_ENDPOINT_PROTO=${DEVLAKE_ENDPOINT_PROTO:-http}
export GRAFANA_ENDPOINT_PROTO=${GRAFANA_ENDPOINT_PROTO:-http}
-envsubst '${LISTENER} ${DEVLAKE_ENDPOINT} ${DEVLAKE_ENDPOINT_PROTO} ${DEVLAKE_CLOUD_API} ${GRAFANA_ENDPOINT} ${GRAFANA_ENDPOINT_PROTO} ${USE_EXTERNAL_GRAFANA} ${SERVER_CONF} ${DNS} ${DNS_VALID}' \
+envsubst '${LISTENER} ${DEVLAKE_ENDPOINT} ${DEVLAKE_ENDPOINT_PROTO} ${GRAFANA_ENDPOINT} ${GRAFANA_ENDPOINT_PROTO} ${USE_EXTERNAL_GRAFANA} ${SERVER_CONF} ${DNS} ${DNS_VALID}' \
< /etc/nginx/conf.d/default.conf.tpl \
> /etc/nginx/conf.d/default.conf
nginx -g 'daemon off;'