diff --git a/files/gitlab-cookbooks/gitaly/recipes/enable.rb b/files/gitlab-cookbooks/gitaly/recipes/enable.rb index ba6a254e239393fdd5951d0675216ef7de10ad79_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRhbHkvcmVjaXBlcy9lbmFibGUucmI=..7ff714d2ba77d67e48457cdb3c14a07ebfe708b2_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRhbHkvcmVjaXBlcy9lbmFibGUucmI= 100644 --- a/files/gitlab-cookbooks/gitaly/recipes/enable.rb +++ b/files/gitlab-cookbooks/gitaly/recipes/enable.rb @@ -81,7 +81,7 @@ end gitlab_url, gitlab_relative_path = WebServerHelper.internal_api_url(node) -custom_hooks_dir = node.dig('gitlab', 'gitlab-shell', 'custom_hooks_dir') || node.dig('gitaly', 'custom_hooks_dir') +custom_hooks_dir = node.dig('gitaly', 'custom_hooks_dir') template "Create Gitaly config.toml" do path config_path diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index ba6a254e239393fdd5951d0675216ef7de10ad79_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..7ff714d2ba77d67e48457cdb3c14a07ebfe708b2_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -609,7 +609,6 @@ default['gitlab']['gitlab-shell']['http_settings'] = nil default['gitlab']['gitlab-shell']['auth_file'] = nil default['gitlab']['gitlab-shell']['git_trace_log_file'] = nil -default['gitlab']['gitlab-shell']['custom_hooks_dir'] = nil default['gitlab']['gitlab-shell']['migration'] = { enabled: true, features: [] } default['gitlab']['gitlab-shell']['ssl_cert_dir'] = "#{node['package']['install-dir']}/embedded/ssl/certs/" # DEPRECATED! Not used by gitlab-shell diff --git a/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb b/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb index ba6a254e239393fdd5951d0675216ef7de10ad79_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRhbHkvcmVjaXBlcy9naXRhbHlfc3BlYy5yYg==..7ff714d2ba77d67e48457cdb3c14a07ebfe708b2_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRhbHkvcmVjaXBlcy9naXRhbHlfc3BlYy5yYg== 100644 --- a/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb +++ b/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb @@ -47,7 +47,6 @@ let(:gitlab_url) { 'http://localhost:3000' } let(:workhorse_addr) { 'localhost:4000' } let(:gitaly_custom_hooks_dir) { '/path/to/gitaly/custom/hooks' } - let(:gitlab_shell_custom_hooks_dir) { '/path/to/gitlab-shell/custom/hooks' } let(:user) { 'user123' } let(:password) { 'password321' } let(:ca_file) { '/path/to/ca_file' } @@ -367,23 +366,6 @@ } end - it 'populates gitaly config.toml with custom deprecated values' do - stub_gitlab_rb( - gitlab_shell: { - custom_hooks_dir: gitlab_shell_custom_hooks_dir - } - ) - - hooks_section = Regexp.new([ - %r{\[hooks\]}, - %r{custom_hooks_dir = '#{Regexp.escape(gitlab_shell_custom_hooks_dir)}'}, - ].map(&:to_s).join('\s+')) - - expect(chef_run).to render_file(config_path).with_content { |content| - expect(content).to match(hooks_section) - } - end - it 'renders the runit run script with custom values' do expect(chef_run).to render_file('/opt/gitlab/sv/gitaly/run') .with_content(%r{ulimit -n #{open_files_ulimit}})