diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 4f926f6a26aef22d3dbef76d83386e0c28c2dfba_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..2bfd8fdc952624910fdaf9e503c700a6e413b3ca_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -1643,6 +1643,9 @@ ##! 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" +##! Enable serving content from disk instead of Object Storage +# gitlab_pages['enable_disk'] = nil + # gitlab_pages['env_directory'] = "/opt/gitlab/etc/gitlab-pages/env" # gitlab_pages['env'] = { # 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" diff --git a/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb b/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb index 4f926f6a26aef22d3dbef76d83386e0c28c2dfba_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvYXR0cmlidXRlcy9kZWZhdWx0LnJi..2bfd8fdc952624910fdaf9e503c700a6e413b3ca_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb @@ -11,6 +11,7 @@ default['gitlab-pages']['http_proxy'] = nil default['gitlab-pages']['metrics_address'] = nil default['gitlab-pages']['pages_path'] = nil +default['gitlab-pages']['enable_disk'] = nil default['gitlab-pages']['domain'] = nil default['gitlab-pages']['cert'] = nil default['gitlab-pages']['cert_key'] = nil diff --git a/files/gitlab-cookbooks/gitlab-pages/templates/default/gitlab-pages-config.erb b/files/gitlab-cookbooks/gitlab-pages/templates/default/gitlab-pages-config.erb index 4f926f6a26aef22d3dbef76d83386e0c28c2dfba_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLXBhZ2VzLWNvbmZpZy5lcmI=..2bfd8fdc952624910fdaf9e503c700a6e413b3ca_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLXBhZ2VzLWNvbmZpZy5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab-pages/templates/default/gitlab-pages-config.erb +++ b/files/gitlab-cookbooks/gitlab-pages/templates/default/gitlab-pages-config.erb @@ -131,3 +131,6 @@ <%- if @gitlab_retrieval_retries -%> gitlab-retrieval-retries=<%= @gitlab_retrieval_retries %> <%- end -%> +<%- if @enable_disk -%> +enable-disk +<%- end -%> diff --git a/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb b/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb index 4f926f6a26aef22d3dbef76d83386e0c28c2dfba_c3BlYy9jaGVmL2dpdGxhYi1wYWdlcy9yZWNpcGVzL2dpdGxhYi1wYWdlc19zcGVjLnJi..2bfd8fdc952624910fdaf9e503c700a6e413b3ca_c3BlYy9jaGVmL2dpdGxhYi1wYWdlcy9yZWNpcGVzL2dpdGxhYi1wYWdlc19zcGVjLnJi 100644 --- a/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb +++ b/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb @@ -221,6 +221,7 @@ gitlab_retrieval_timeout: "3s", gitlab_retrieval_interval: "500ms", gitlab_retrieval_retries: 5, + enable_disk: true, env: { GITLAB_CONTINUOUS_PROFILING: "stackdriver?service=gitlab-pages", }, @@ -277,6 +278,7 @@ gitlab-retrieval-timeout=3s gitlab-retrieval-timeout=500ms gitlab-retrieval-retries=5 + enable-disk EOS expect(chef_run).to render_file("/var/opt/gitlab/pages/gitlab-pages-config").with_content(expected_content)