Skip to content
Snippets Groups Projects
Commit fd8c82c2 authored by Naman Jagdish Gala's avatar Naman Jagdish Gala
Browse files

Add rate_limit_bypass_cidrs parameter for Pages

- Allow administrators to set a list of CIDR addresses that
  can bypass the rate limit.

Related: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8649

Changelog: added
parent 6ce24587
No related branches found
No related tags found
2 merge requests!153heptapod#1722: making 17.3 the new stable,!152Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -71,6 +71,7 @@
default['gitlab_pages']['rate_limit_tls_source_ip_burst'] = nil
default['gitlab_pages']['rate_limit_tls_domain'] = nil
default['gitlab_pages']['rate_limit_tls_domain_burst'] = nil
default['gitlab_pages']['rate_limit_subnets_allow_list'] = []
# HTTP Server timeouts
default['gitlab_pages']['server_read_timeout'] = nil
default['gitlab_pages']['server_read_header_timeout'] = nil
......
......@@ -167,6 +167,9 @@
<%- if @rate_limit_tls_domain_burst -%>
rate-limit-tls-domain-burst=<%= @rate_limit_tls_domain_burst %>
<%-end -%>
<%- unless @rate_limit_subnets_allow_list.empty? -%>
rate-limit-subnets-allow-list=<%= @rate_limit_subnets_allow_list.join(',') %>
<%- end -%>
<%- if @server_read_timeout -%>
server-read-timeout=<%= @server_read_timeout %>
<%-end -%>
......
......@@ -285,6 +285,7 @@
rate_limit_tls_source_ip_burst: 51,
rate_limit_tls_domain: 1001,
rate_limit_tls_domain_burst: 10001,
rate_limit_subnets_allow_list: ["10.1.1.0/24", "10.1.2.0/24"],
server_read_timeout: "1m",
server_read_header_timeout: "2m",
server_write_timeout: "3m",
......@@ -363,6 +364,7 @@
rate-limit-tls-source-ip-burst=51
rate-limit-tls-domain=1001
rate-limit-tls-domain-burst=10001
rate-limit-subnets-allow-list=10.1.1.0/24,10.1.2.0/24
server-read-timeout=1m
server-read-header-timeout=2m
server-write-timeout=3m
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment