Skip to content
Snippets Groups Projects
Commit 42034df1 authored by DJ Mountney's avatar DJ Mountney
Browse files

Remove support for gitlab_pages['http_proxy']

Changelog: removed
parent e01816a7
No related branches found
No related tags found
2 merge requests!51Validate shift of Heptapod 0.25 to oldstable series,!44GitLab 14.0
......@@ -8,7 +8,6 @@
default['gitlab-pages']['listen_proxy'] = "localhost:8090"
default['gitlab-pages']['gitlab_server'] = nil
default['gitlab-pages']['internal_gitlab_server'] = nil
default['gitlab-pages']['http_proxy'] = nil
default['gitlab-pages']['metrics_address'] = nil
default['gitlab-pages']['pages_path'] = nil
default['gitlab-pages']['enable_disk'] = nil
......
......@@ -98,9 +98,6 @@
'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/",
}
node.default['gitlab-pages']['env']['http_proxy'] = node['gitlab-pages']['http_proxy'] \
unless node['gitlab-pages']['http_proxy'].nil?
env_dir env_directory do
variables node['gitlab-pages']['env']
notifies :restart, "runit_service[gitlab-pages]" if omnibus_helper.should_notify?('gitlab-pages')
......
......@@ -296,23 +296,6 @@
expect(chef_run).to render_file("/opt/gitlab/etc/gitlab-pages/env/SSL_CERT_DIR")
.with_content('/opt/gitlab/embedded/ssl/certs')
end
context 'when http_proxy is specified' do
before do
stub_gitlab_rb(
external_url: 'https://gitlab.example.com',
pages_external_url: 'https://pages.example.com',
gitlab_pages: {
http_proxy: 'http://example:8081'
}
)
end
it 'renders an environment variable file with http_proxy' do
expect(chef_run).to render_file("/opt/gitlab/etc/gitlab-pages/env/http_proxy")
.with_content('http://example:8081')
end
end
end
describe 'logrotate settings' do
......
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