vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:coreos-inc/quay

Browse source
This commit is contained in:
Joseph Schorr 2015-02-25 13:47:43 -05:00
commit 516b0133e2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/rate-limiting.conf
View file

@ -9,7 +9,7 @@ map $http_authorization $registry_bucket {
default $http_authorization;
}
limit_req_zone $proxy_protocol_addr zone=api:10m rate=2r/s;
limit_req_zone $proxy_protocol_addr zone=verbs:10m rate=2r/s;
limit_req_zone $registry_bucket zone=repositories:10m rate=2r/s;
limit_req_status 429;
limit_req_log_level warn;

5
conf/server-base.conf
View file

@ -26,6 +26,9 @@ location /realtime {
proxy_request_buffering off;
}
# At the begining and end of a push/pull, /v1/repositories is hit by the Docker
# client. By rate-limiting just this endpoint, we can avoid accidentally
# blocking pulls/pushes for images with many layers.
location /v1/repositories/ {
proxy_buffering off;
@ -57,7 +60,7 @@ location /c1/ {
proxy_pass http://verbs_app_server;
proxy_temp_path /var/log/nginx/proxy_temp 1 2;
limit_req zone=api burst=10;
limit_req zone=verbs burst=10;
}
location /static/ {