diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index fae7448f2..22b62760d 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -1,5 +1,6 @@ {%- from 'vars/globals.map.jinja' import GLOBALS %} {%- from 'docker/docker.map.jinja' import DOCKER %} +{%- from 'nginx/config.map.jinja' import NGMERGED %} {%- set role = grains.id.split('_') | last %} {%- set influxpass = salt['pillar.get']('secrets:influx_pass') %} {%- set influxauth = ('so:' + influxpass) | base64_encode %} @@ -33,7 +34,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - limit_req_zone $binary_remote_addr zone=auth_throttle:10m rate={{ NGMERGED.config.login_throttle_rate }}r/m; + limit_req_zone $binary_remote_addr zone=auth_throttle:10m rate={{ NGMERGED.config.throttle_login_rate }}r/m; include /etc/nginx/conf.d/*.conf; @@ -147,7 +148,7 @@ http { location ~ ^/auth/.*?(login) { rewrite /auth/(.*) /$1 break; - limit_req zone=auth_throttle burst={{ NGMERGED.config.login_throttle_burst }} nodelay; + limit_req zone=auth_throttle burst={{ NGMERGED.config.throttle_login_burst }} nodelay; limit_req_status 429; proxy_pass http://{{ GLOBALS.manager }}:4433; proxy_read_timeout 90;