Download as
Browse Code »

Commit 516c22441a33d1f053aeb0b2d5a1b686e2863f60

Authored by Florent Baldino
1 parent 5476b0dc
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Add 'gitlab_ssh_host' for gitlab.rb

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @516c224
@@ -54,6 +54,7 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 60 @@ -54,6 +54,7 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 60
54 default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn'] 54 default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
55 default['gitlab']['gitlab-rails']['gitlab_port'] = 80 55 default['gitlab']['gitlab-rails']['gitlab_port'] = 80
56 default['gitlab']['gitlab-rails']['gitlab_https'] = false 56 default['gitlab']['gitlab-rails']['gitlab_https'] = false
  57 +default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
57 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}" 58 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
58 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10 59 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
59 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil 60 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @516c224
@@ -17,7 +17,7 @@ production: &base @@ -17,7 +17,7 @@ production: &base
17 # Uncommment this line below if your ssh host is different from HTTP/HTTPS one 17 # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
18 # (you'd obviously need to replace ssh.host_example.com with your own host). 18 # (you'd obviously need to replace ssh.host_example.com with your own host).
19 # Otherwise, ssh host will be set to the `host:` value above 19 # Otherwise, ssh host will be set to the `host:` value above
20 - # ssh_host: ssh.host_example.com 20 + ssh_host: <%= @gitlab_ssh_host %>
21 21
22 # WARNING: See config/application.rb under "Relative url support" for the list of 22 # WARNING: See config/application.rb under "Relative url support" for the list of
23 # other files that need to be changed for relative url support 23 # other files that need to be changed for relative url support