Merge remote-tracking branch 'upstream/v2-phase4' into python-registry-v2

This commit is contained in:
Jake Moshenko 2015-10-22 16:59:28 -04:00
commit e7a6176594
105 changed files with 4439 additions and 2074 deletions

View file

@ -5,7 +5,7 @@ real_ip_recursive on;
log_format lb_pp '$remote_addr ($proxy_protocol_addr) '
'- $remote_user [$time_local] '
'"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent"'
'"$http_referer" "$http_user_agent"';
types_hash_max_size 2048;
include /usr/local/nginx/conf/mime.types.default;

View file

@ -4,6 +4,10 @@ server_name _;
keepalive_timeout 5;
if ($host = "www.quay.io") {
return 301 $scheme://quay.io$request_uri;
}
if ($args ~ "_escaped_fragment_") {
rewrite ^ /snapshot$uri;
}