diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 76e7a95f8f5baca58354579f61e50ec6c2e9b58d_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..3628b6fc7e334418eed3051a2deb46d3a738079e_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -1599,10 +1599,6 @@ # gitlab_pages['artifacts_server_url'] = nil # Defaults to external_url + '/api/v4' # gitlab_pages['artifacts_server_timeout'] = 10 -##! Environments that do not support bind-mounting should set this parameter to -##! true. This is incompatible with the artifacts server -# gitlab_pages['inplace_chroot'] = false - ##! Prometheus metrics for Pages docs: https://gitlab.com/gitlab-org/gitlab-pages/#enable-prometheus-metrics # gitlab_pages['metrics_address'] = ":9235" diff --git a/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb b/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb index 76e7a95f8f5baca58354579f61e50ec6c2e9b58d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvYXR0cmlidXRlcy9kZWZhdWx0LnJi..3628b6fc7e334418eed3051a2deb46d3a738079e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab-pages/attributes/default.rb @@ -24,7 +24,6 @@ default['gitlab-pages']['artifacts_server'] = true default['gitlab-pages']['artifacts_server_url'] = nil default['gitlab-pages']['artifacts_server_timeout'] = 10 -default['gitlab-pages']['inplace_chroot'] = false default['gitlab-pages']['propagate_correlation_id'] = false default['gitlab-pages']['log_verbose'] = false default['gitlab-pages']['access_control'] = false 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 76e7a95f8f5baca58354579f61e50ec6c2e9b58d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItcGFnZXMvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLXBhZ2VzLWNvbmZpZy5lcmI=..3628b6fc7e334418eed3051a2deb46d3a738079e_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 @@ -1,8 +1,5 @@ pages-domain=<%= @domain %> pages-root=<%= @pages_root %> -daemon-uid=<%= Etc.getpwnam(node['gitlab']['user']['username']).uid %> -daemon-gid=<%= Etc.getpwnam(node['gitlab']['user']['username']).gid %> -daemon-inplace-chroot=<%= @inplace_chroot %> api-secret-key=<%= @api_secret_key_path %> <%- if @access_control -%> <%- if @gitlab_id -%> diff --git a/files/gitlab-cookbooks/package/libraries/deprecations.rb b/files/gitlab-cookbooks/package/libraries/deprecations.rb index 76e7a95f8f5baca58354579f61e50ec6c2e9b58d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9kZXByZWNhdGlvbnMucmI=..3628b6fc7e334418eed3051a2deb46d3a738079e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9kZXByZWNhdGlvbnMucmI= 100644 --- a/files/gitlab-cookbooks/package/libraries/deprecations.rb +++ b/files/gitlab-cookbooks/package/libraries/deprecations.rb @@ -134,6 +134,12 @@ note: "This parameter was introduced as a temporary solution in case of unforseen problems with new storage format. It will be removed in 14.3. If you use this parameter, please comment on https://gitlab.com/gitlab-org/gitlab/-/issues/331699" }, { + config_keys: %w(gitlab-pages daemon-inplace-chroot), + deprecation: '14.4', + removal: '15.0', + note: "Starting with GitLab 14.3, chroot has been removed along with disk-based configuration source. Because of this, the flag is a no-op and can be removed." + }, + { config_keys: %w(praefect database_host_no_proxy), deprecation: '14.0', removal: '15.0', # https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6150 diff --git a/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb b/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb index 76e7a95f8f5baca58354579f61e50ec6c2e9b58d_c3BlYy9jaGVmL2dpdGxhYi1wYWdlcy9yZWNpcGVzL2dpdGxhYi1wYWdlc19zcGVjLnJi..3628b6fc7e334418eed3051a2deb46d3a738079e_c3BlYy9jaGVmL2dpdGxhYi1wYWdlcy9yZWNpcGVzL2dpdGxhYi1wYWdlc19zcGVjLnJi 100644 --- a/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb +++ b/spec/chef/gitlab-pages/recipes/gitlab-pages_spec.rb @@ -57,9 +57,6 @@ default_content = <<~EOS pages-domain=pages.example.com pages-root=/var/opt/gitlab/gitlab-rails/shared/pages - daemon-uid=1000 - daemon-gid=1000 - daemon-inplace-chroot=false api-secret-key=/var/opt/gitlab/gitlab-pages/.gitlab_pages_secret listen-proxy=localhost:8090 log-format=json @@ -190,7 +187,6 @@ artifacts_server_timeout: 60, status_uri: '/@status', max_connections: 7500, - inplace_chroot: true, propagate_correlation_id: true, log_format: 'text', log_verbose: true, @@ -232,9 +228,6 @@ expected_content = <<~EOS pages-domain=pages.example.com pages-root=/var/opt/gitlab/gitlab-rails/shared/pages - daemon-uid=1000 - daemon-gid=1000 - daemon-inplace-chroot=true api-secret-key=/var/opt/gitlab/pages/.gitlab_pages_secret auth-client-id=app_id auth-redirect-uri=https://projects.pages.example.com/auth