Commit 49f9498f authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'remove_standalone_ci_components' into 'master'

Remove deprecated standalone CI configuration in preparation for 9.0

See merge request !45
parents 4314f941 62a53b72
# 0.3.15
- Remove deprecated standalone CI configuration
# 0.3.14
- Add log option for cronjob
......@@ -28,7 +32,7 @@
# 0.3.7
- Remove the custom header added in 0.3.6.
- Remove the custom header added in 0.3.6.
- Update Cronic version checksum (Evan Felix)
- Configurable package timeout setting (Jan Skarvall)
......
......@@ -15,8 +15,6 @@ default['omnibus-gitlab']['ssh']['host_keys'] = {} # hash of 'filename' => 'cont
default['omnibus-gitlab']['gitlab_rb']['nginx']['ssl_certificate'] = '/etc/gitlab/ssl/nginx.crt'
default['omnibus-gitlab']['gitlab_rb']['nginx']['ssl_certificate_key'] = '/etc/gitlab/ssl/nginx.key'
default['omnibus-gitlab']['gitlab_rb']['ci-nginx']['ssl_certificate'] = '/etc/gitlab/ssl/ci-nginx.crt'
default['omnibus-gitlab']['gitlab_rb']['ci-nginx']['ssl_certificate_key'] = '/etc/gitlab/ssl/ci-nginx.key'
default['omnibus-gitlab']['gitlab_rb']['mattermost-nginx']['ssl_certificate'] = '/etc/gitlab/ssl/mattermost-nginx.crt'
default['omnibus-gitlab']['gitlab_rb']['mattermost-nginx']['ssl_certificate_key'] = '/etc/gitlab/ssl/mattermost-nginx.key'
default['omnibus-gitlab']['gitlab_rb']['pages-nginx']['ssl_certificate'] = '/etc/gitlab/ssl/pages.crt'
......@@ -26,8 +24,6 @@ default['omnibus-gitlab']['gitlab_rb']['registry-nginx']['ssl_certificate_key']
default['omnibus-gitlab']['ssl']['certificate'] = ''
default['omnibus-gitlab']['ssl']['private_key'] = ''
default['omnibus-gitlab']['ssl']['ci_certificate'] = ''
default['omnibus-gitlab']['ssl']['ci_private_key'] = ''
default['omnibus-gitlab']['ssl']['mattermost_certificate'] = ''
default['omnibus-gitlab']['ssl']['mattermost_private_key'] = ''
default['omnibus-gitlab']['ssl']['pages_certificate'] = ''
......
......@@ -88,19 +88,6 @@ file node['omnibus-gitlab']['gitlab_rb']['nginx']['ssl_certificate_key'] do
notifies :run, 'bash[reload nginx configuration]'
end
file node['omnibus-gitlab']['gitlab_rb']['ci-nginx']['ssl_certificate'] do
content ssl['ci_certificate']
not_if { ssl['ci_certificate'].nil? }
notifies :run, 'bash[reload nginx configuration]'
end
file node['omnibus-gitlab']['gitlab_rb']['ci-nginx']['ssl_certificate_key'] do
content ssl['ci_private_key']
not_if { ssl['ci_private_key'].nil? }
mode '0600'
notifies :run, 'bash[reload nginx configuration]'
end
file node['omnibus-gitlab']['gitlab_rb']['mattermost-nginx']['ssl_certificate'] do
content ssl['mattermost_certificate']
not_if { ssl['mattermost_certificate'].nil? }
......
......@@ -2,7 +2,6 @@
# Do not edit by hand, your changes will be reverted!
external_url <%= single_quote @gitlab_rb['external_url'] %>
ci_external_url <%= single_quote @gitlab_rb['ci_external_url'] %>
mattermost_external_url <%= single_quote @gitlab_rb['mattermost_external_url'] %>
pages_external_url <%= single_quote @gitlab_rb['pages_external_url'] %>
registry_external_url <%= single_quote @gitlab_rb['registry_external_url'] %>
......@@ -20,19 +19,15 @@ manage-accounts
manage-storage-directories
user
redis
ci-redis
gitlab-rails
gitlab-ci
gitlab-shell
unicorn
ci-unicorn
sidekiq
ci-sidekiq
gitlab-git-http-server
gitlab-workhorse
mailroom
nginx
ci-nginx
mattermost-nginx
pages-nginx
registry-nginx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment