Skip to content
Snippets Groups Projects
Commit 4a44d808 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'include_ci_oauth_settings' into 'master'

Include ci oauth settings

Changes required for 7.7 release.

See merge request !276
parents 186f6c55 bead7f18
No related branches found
No related tags found
No related merge requests found
......@@ -397,7 +397,7 @@
# application.yml configuration #
#################################
# gitlab_ci['gitlab_server_urls'] = ['http://gitlab.example.com', 'http://gitlab2.example.com']
# gitlab_ci['gitlab_server'] = { "url" => 'http://gitlab.example.com', "app_id" => '12345678', "app_secret" => 'QWERTY12345' }
# gitlab_ci['gitlab_ci_email_from'] = 'gitlab-ci@example.com'
# gitlab_ci['gitlab_ci_support_email'] = 'gitlab-ci@example.com'
......
......@@ -374,7 +374,7 @@
default['gitlab']['gitlab-ci']['shell'] = "/bin/false"
# application.yml top-level settings
default['gitlab']['gitlab-ci']['gitlab_server_urls'] = nil
default['gitlab']['gitlab-ci']['gitlab_server'] = nil
# application.yml, gitlab_ci section
default['gitlab']['gitlab-ci']['gitlab_ci_host'] = node['fqdn']
......
......@@ -136,7 +136,14 @@
end
unicorn_url = "http://#{node['gitlab']['unicorn']['listen']}:#{node['gitlab']['unicorn']['port']}"
gitlab_server_urls = node['gitlab']['gitlab-ci']['gitlab_server_urls'] || [unicorn_url]
gitlab_server_url = if node['gitlab']['gitlab-ci']['gitlab_server_urls']
node['gitlab']['gitlab-ci']['gitlab_server_urls'].first
end
gitlab_server = if node['gitlab']['gitlab-ci']['gitlab_server']
node['gitlab']['gitlab-ci']['gitlab_server']
else
{ 'url' => gitlab_server_url || unicorn_url, 'app_id' => nil, 'app_secret' => nil}
end
template_symlink File.join(gitlab_ci_etc_dir, "application.yml") do
link_from File.join(gitlab_ci_source_dir, "config/application.yml")
......@@ -147,7 +154,7 @@
mode "0644"
variables(
node['gitlab']['gitlab-ci'].to_hash.merge(
:gitlab_server_urls => gitlab_server_urls
:gitlab_server => gitlab_server
)
)
restarts dependent_services
......
defaults: &defaults
gitlab_server_urls:
<%= @gitlab_server_urls.to_json %>
gitlab_server:
<%= @gitlab_server.to_json %>
......@@ -4,5 +4,5 @@
## Gitlab CI settings
## Gitlab CI settings
gitlab_ci:
## Web server settings
host: <%= @gitlab_ci_host %>
......@@ -12,6 +12,6 @@
## Email settings
# Email address used in the "From" field in mails sent by GitLab-CI
email_from: <%= @gitlab_ci_email_from %>
# Email address of your support contact (default: same as email_from)
support_email: <%= @gitlab_ci_support_email %>
......@@ -16,7 +16,7 @@
# Email address of your support contact (default: same as email_from)
support_email: <%= @gitlab_ci_support_email %>
# Default project notifications settings:
# Default project notifications settings:
#
# Send emails only on broken builds (default: true)
all_broken_builds: <%= @gitlab_ci_all_broken_builds %>
......@@ -20,6 +20,6 @@
#
# Send emails only on broken builds (default: true)
all_broken_builds: <%= @gitlab_ci_all_broken_builds %>
#
#
# Add committer to recipients list (default: false)
add_committer: <%= @gitlab_ci_add_committer %>
......@@ -24,6 +24,6 @@
# Add committer to recipients list (default: false)
add_committer: <%= @gitlab_ci_add_committer %>
gravatar:
enabled: <%= @gravatar_enabled %>
plain_url: <%= single_quote(@gravatar_plain_url) %>
......@@ -35,8 +35,9 @@
test:
<<: *defaults
gitlab_server_urls:
- 'http://demo.gitlab.com/'
gitlab_server:
url: 'http://demo.gitlab.com/'
app_id: 'id'
app_secret: 'secret'
production:
<<: *defaults
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