Skip to content
Snippets Groups Projects
Commit f97305da authored by feistel's avatar feistel
Browse files

Remove support for gitlab_pages['use_legacy_storage'] setting

Changelog: removed
parent c0bf448e
No related branches found
No related tags found
2 merge requests!55Intermediate build after shift of stable series,!54GitLab 14.4
......@@ -1599,12 +1599,6 @@
##! GitLab API JWT Token expiry time
# gitlab_pages['gitlab_client_jwt_expiry'] = "30s"
##! Fallback to legacy storage
##! Warning: support for this flag will be removed in %14.3
##! If you need to use it, please comment on https://gitlab.com/gitlab-org/gitlab/-/issues/331699
##! and describe why
# gitlab_pages['use_legacy_storage'] = nil
##! Advanced settings for API-based configuration for GitLab Pages.
##! The recommended default values are set inside GitLab Pages.
##! Should be changed only if absolutely needed.
......
......@@ -43,7 +43,6 @@
default['gitlab-pages']['api_secret_key'] = nil
default['gitlab-pages']['gitlab_client_http_timeout'] = nil
default['gitlab-pages']['gitlab_client_jwt_expiry'] = nil
default['gitlab-pages']['use_legacy_storage'] = nil
default['gitlab-pages']['env_directory'] = '/opt/gitlab/etc/gitlab-pages/env'
# Serving from zip archives fine grained configuration.
# The recommended default values are set inside GitLab Pages.
......
......@@ -97,9 +97,6 @@
<%- if @gitlab_client_jwt_expiry -%>
gitlab-client-jwt-expiry=<%= @gitlab_client_jwt_expiry %>
<%- end -%>
<%- if @use_legacy_storage -%>
domain-config-source=disk
<%- end -%>
<%- unless @pages_external_http.empty? -%>
listen-http=<%= @pages_external_http.join(',') %>
<%- end -%>
......
......@@ -209,7 +209,6 @@
headers: ['X-XSS-Protection: 1; mode=block', 'X-Content-Type-Options: nosniff', 'Test: Header'],
gitlab_client_http_timeout: "10s",
gitlab_client_jwt_expiry: "30s",
use_legacy_storage: true,
zip_cache_expiration: "120s",
zip_cache_cleanup: "1m",
zip_cache_refresh: "60s",
......@@ -266,7 +265,6 @@
tls-max-version=tls1.2
gitlab-client-http-timeout=10s
gitlab-client-jwt-expiry=30s
domain-config-source=disk
listen-http=external_pages.example.com,localhost:9000
listen-https=external_pages.example.com,localhost:9001
listen-https-proxyv2=external_pages.example.com,localhost:9002
......
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