Merge branch '7-scalability' into 'development'

fix:#7 fixed nginx config

See merge request htwk-software/htwkalender!26
This commit is contained in:
Elmar Kresse
2024-06-10 21:02:38 +00:00
2 changed files with 12 additions and 14 deletions

View File

@ -107,12 +107,6 @@ http {
1 $binary_remote_addr; 1 $binary_remote_addr;
} }
# Different rate limits for different request methods
map $request_method $limit_zone {
POST createFeed; # Create feed is limited to 1 request per minute
default feed; # All other requests are limited to 20 requests per minute
}
# Limit the number of requests per IP # Limit the number of requests per IP
limit_req_zone $limit_key zone=feed:20m rate=20r/m; limit_req_zone $limit_key zone=feed:20m rate=20r/m;
limit_req_zone $limit_key zone=createFeed:10m rate=1r/m; limit_req_zone $limit_key zone=createFeed:10m rate=1r/m;
@ -153,7 +147,12 @@ http {
proxy_read_timeout 600s; proxy_read_timeout 600s;
proxy_send_timeout 600s; proxy_send_timeout 600s;
send_timeout 600s; send_timeout 600s;
limit_req zone=$limit_zone burst=10 nodelay;
# Apply rate limiting
if ($request_method = POST) {
limit_req zone=createFeed burst=10 nodelay;
}
limit_req zone=feed burst=10 nodelay;
limit_req_status 429; limit_req_status 429;
} }

View File

@ -108,12 +108,6 @@ http {
1 $binary_remote_addr; 1 $binary_remote_addr;
} }
# Different rate limits for different request methods
map $request_method $limit_zone {
POST createFeed; # Create feed is limited to 1 request per minute
default feed; # All other requests are limited to 20 requests per minute
}
# Limit the number of requests per IP # Limit the number of requests per IP
limit_req_zone $limit_key zone=feed:20m rate=20r/m; limit_req_zone $limit_key zone=feed:20m rate=20r/m;
limit_req_zone $limit_key zone=createFeed:10m rate=1r/m; limit_req_zone $limit_key zone=createFeed:10m rate=1r/m;
@ -142,7 +136,12 @@ http {
proxy_read_timeout 600s; proxy_read_timeout 600s;
proxy_send_timeout 600s; proxy_send_timeout 600s;
send_timeout 600s; send_timeout 600s;
limit_req zone=$limit_zone burst=10 nodelay;
# Apply rate limiting
if ($request_method = POST) {
limit_req zone=createFeed burst=10 nodelay;
}
limit_req zone=feed burst=10 nodelay;
limit_req_status 429; limit_req_status 429;
} }