Skip to content
Snippets Groups Projects
Commit c612e8bc authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'pages-add-zip-timeout-params' into 'master'

add pages zip http client timeout option

See merge request gitlab-org/omnibus-gitlab!5975
parents 86a4655a d1ca3012
2 merge requests!71heptapod#685: making 0.32 the new stable,!69GitLab 14.10 / Heptapod 0.32
......@@ -1739,6 +1739,8 @@
# gitlab_pages['zip_cache_refresh'] = "30s"
##! The maximum amount of time it takes to open a zip archive from the file system or object storage.
# gitlab_pages['zip_open_timeout'] = "30s"
##! Zip HTTP Client timeout
# gitlab_pages['zip_http_client_timeout'] = "30m"
##! Enable serving content from disk instead of Object Storage
# gitlab_pages['enable_disk'] = nil
......
......@@ -51,6 +51,7 @@
default['gitlab-pages']['zip_cache_cleanup'] = nil
default['gitlab-pages']['zip_cache_refresh'] = nil
default['gitlab-pages']['zip_open_timeout'] = nil
default['gitlab-pages']['zip_http_client_timeout'] = nil
# API-based fine grained configuration.
# The recommended default values are set inside GitLab Pages.
default['gitlab-pages']['gitlab_cache_expiry'] = nil
......
......@@ -30,6 +30,9 @@
<%- if @zip_open_timeout-%>
zip-open-timeout=<%= @zip_open_timeout %>
<%- end -%>
<%- if @zip_http_client_timeout-%>
zip-http-client-timeout=<%= @zip_http_client_timeout %>
<%- end -%>
<%- if @listen_proxy-%>
listen-proxy=<%= @listen_proxy %>
<%- end -%>
......
......@@ -211,6 +211,7 @@
zip_cache_cleanup: "1m",
zip_cache_refresh: "60s",
zip_open_timeout: "45s",
zip_http_client_timeout: "30m",
internal_gitlab_server: "https://int.gitlab.example.com",
gitlab_cache_expiry: "1m",
gitlab_cache_refresh: "500ms",
......@@ -248,6 +249,7 @@
zip-cache-cleanup=1m
zip-cache-refresh=60s
zip-open-timeout=45s
zip-http-client-timeout=30m
listen-proxy=localhost:8090
metrics-address=localhost:1234
pages-status=/@status
......
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