Merge remote-tracking branch 'master/master' into e2e-3

This commit is contained in:
Manuel de Brito Fontes 2017-09-13 16:24:45 -03:00
commit 8b5092bed6

View file

@ -50,7 +50,7 @@ http {
{{ end }}
sendfile on;
aio threads;
aio_write on;
@ -304,7 +304,7 @@ http {
{{ range $rl := (filterRateLimits $servers ) }}
# Ratelimit {{ $rl.Name }}
geo $whitelist_{{ $rl.ID }} {
geo $the_real_ip $whitelist_{{ $rl.ID }} {
default 0;
{{ range $ip := $rl.Whitelist }}
{{ $ip }} 1;{{ end }}