Skip to content
Snippets Groups Projects
Commit 3957a5f5 authored by Hüseyin Emre Aksoy's avatar Hüseyin Emre Aksoy
Browse files

Make GitLab Pages server shutdown timeout configurable

Changelog: added
parent 6221326e
No related branches found
No related tags found
2 merge requests!67heptapod#675: making 0.31 the new stable,!66GitLab 14.9
......@@ -1693,6 +1693,10 @@
# gitlab_pages['auth_secret'] = nil # Generated if not present
# gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security
##! GitLab Pages Server Shutdown Timeout
##! Duration ("30s" for 30 seconds)
# gitlab_pages['server_shutdown_timeout'] = "30s"
##! GitLab API HTTP client connection timeout
# gitlab_pages['gitlab_client_http_timeout'] = "10s"
......
......@@ -42,6 +42,7 @@
default['gitlab-pages']['headers'] = nil
default['gitlab-pages']['api_secret_key'] = nil
default['gitlab-pages']['gitlab_client_http_timeout'] = nil
default['gitlab-pages']['server_shutdown_timeout'] = nil
default['gitlab-pages']['gitlab_client_jwt_expiry'] = nil
default['gitlab-pages']['env_directory'] = '/opt/gitlab/etc/gitlab-pages/env'
# Serving from zip archives fine grained configuration.
......
......@@ -91,6 +91,9 @@
<%- if @tls_max_version-%>
tls-max-version=<%= @tls_max_version %>
<%- end -%>
<%- if @server_shutdown_timeout -%>
server-shutdown-timeout=<%= @server_shutdown_timeout %>
<%- end -%>
<%- if @gitlab_client_http_timeout -%>
gitlab-client-http-timeout=<%= @gitlab_client_http_timeout %>
<%- end -%>
......@@ -154,4 +157,4 @@
<%-end -%>
<%- if @rate_limit_tls_domain_burst -%>
rate-limit-tls-domain-burst=<%= @rate_limit_tls_domain_burst %>
<%-end -%>
\ No newline at end of file
<%-end -%>
......@@ -204,6 +204,7 @@
sentry_dsn: 'https://b44a0828b72421a6d8e99efd68d44fa8@example.com/40',
sentry_environment: 'production',
headers: ['X-XSS-Protection: 1; mode=block', 'X-Content-Type-Options: nosniff', 'Test: Header'],
server_shutdown_timeout: "30s",
gitlab_client_http_timeout: "10s",
gitlab_client_jwt_expiry: "30s",
zip_cache_expiration: "120s",
......@@ -266,6 +267,7 @@
insecure-ciphers
tls-min-version=tls1.0
tls-max-version=tls1.2
server-shutdown-timeout=30s
gitlab-client-http-timeout=10s
gitlab-client-jwt-expiry=30s
listen-http=external_pages.example.com,localhost:9000
......
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