Merge branch 'master' of gitlab.com:gitlab-org/omnibus-gitlab

Jacob Vosmaer
2 parents bb24d7b8 b89ea495
Showing 3 changed files with 3 additions and 1 deletions Show diff stats
CHANGELOG
files/gitlab-cookbooks/gitlab/attributes/default.rb
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -6,6 +6,7 @@ omnibus-gitlab repository.
 7.2.0
 - Pass environment variables to Unicorn and Sidekiq (Chris Portman)
 - Add openssl_verify_mode to SMTP email configuration (Dionysius Marquis)
+- Enable the 'ssh_host' field in gitlab.yml (Florent Baldino)
  
 7.1.0
 - Build: explicitly use .forward for sending notifications
@@ -54,6 +54,7 @@ default[&#39;gitlab&#39;][&#39;gitlab-rails&#39;][&#39;rate_limit_period&#39;] = 60
 default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
 default['gitlab']['gitlab-rails']['gitlab_port'] = 80
 default['gitlab']['gitlab-rails']['gitlab_https'] = false
+default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
@@ -17,7 +17,7 @@ production: &amp;base
     # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
     # (you'd obviously need to replace ssh.host_example.com with your own host).
     # Otherwise, ssh host will be set to the `host:` value above
-    # ssh_host: ssh.host_example.com
+    ssh_host: <%= @gitlab_ssh_host %>
  
     # WARNING: See config/application.rb under "Relative url support" for the list of
     # other files that need to be changed for relative url support
...	...	@@ -6,6 +6,7 @@ omnibus-gitlab repository.
6	6	7.2.0
7	7	- Pass environment variables to Unicorn and Sidekiq (Chris Portman)
8	8	- Add openssl_verify_mode to SMTP email configuration (Dionysius Marquis)
	9	+- Enable the 'ssh_host' field in gitlab.yml (Florent Baldino)
9	10
10	11	7.1.0
11	12	- Build: explicitly use .forward for sending notifications
...	...
...	...	@@ -54,6 +54,7 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 60
54	54	default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
55	55	default['gitlab']['gitlab-rails']['gitlab_port'] = 80
56	56	default['gitlab']['gitlab-rails']['gitlab_https'] = false
	57	+default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
57	58	default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
58	59	default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
59	60	default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
...	...
...	...	@@ -17,7 +17,7 @@ production: &base
17	17	# Uncommment this line below if your ssh host is different from HTTP/HTTPS one
18	18	# (you'd obviously need to replace ssh.host_example.com with your own host).
19	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	22	# WARNING: See config/application.rb under "Relative url support" for the list of
23	23	# other files that need to be changed for relative url support
...	...