From c55c883f8cc7b86c659593a5a15288b69fe0fd7a Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Wed, 16 Oct 2024 12:11:00 +0200 Subject: [PATCH] Remove ratelimit for ci.dev.mariadb.org --- docker-compose/nginx/templates/bb.conf.template | 4 ++-- docker-compose/nginx/templates/ci.conf.template | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/docker-compose/nginx/templates/bb.conf.template b/docker-compose/nginx/templates/bb.conf.template index 23a80f69..68747d37 100644 --- a/docker-compose/nginx/templates/bb.conf.template +++ b/docker-compose/nginx/templates/bb.conf.template @@ -15,7 +15,7 @@ server { } # Default rate limited zone, with 30 requests per minute -limit_req_zone $request_uri zone=default:10m rate=30r/m; +limit_req_zone $request_uri zone=bb:10m rate=30r/m; client_max_body_size 10M; server { @@ -34,7 +34,7 @@ server { # Use default zone for rate limiting, allow burst of 10 requests with # no delay - limit_req zone=default burst=10 nodelay; + limit_req zone=bb burst=10 nodelay; location / { proxy_pass http://127.0.0.1:8010; diff --git a/docker-compose/nginx/templates/ci.conf.template b/docker-compose/nginx/templates/ci.conf.template index c65132c0..f3ce8ecd 100644 --- a/docker-compose/nginx/templates/ci.conf.template +++ b/docker-compose/nginx/templates/ci.conf.template @@ -14,10 +14,6 @@ server { } } -# Default rate limited zone, with 30 requests per minute -limit_req_zone $request_uri zone=default:10m rate=30r/m; -client_max_body_size 10M; - server { listen 443 ssl; listen [::]:443 ssl; @@ -25,12 +21,6 @@ server { server_name ${NGINX_ARTIFACTS_VHOST}; - # ratelimit is disabled, do we need it on ci.mariadb.org, probably not - # (static website) - # Use default zone for rate limiting, allow burst of 10 requests with no - # delay - # limit_req zone=default burst=10 nodelay; - root /srv/buildbot/packages/; location /helper_files { alias /srv/buildbot/helper_files; #FIXME - for consistency, on hz-bbm2 let's rename it to helper_files instead of mariadb-shared-packages (current PROD)