Download as
Browse Code »

Commit 0d712907a8e60a1dd7688c22f31675f30ab26183

Authored by Jacob Vosmaer
2 parents bb24d7b8 b89ea495
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

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

Showing 3 changed files with 3 additions and 1 deletions   Show diff stats
@@ -6,6 +6,7 @@ omnibus-gitlab repository. @@ -6,6 +6,7 @@ omnibus-gitlab repository.
6 7.2.0 6 7.2.0
7 - Pass environment variables to Unicorn and Sidekiq (Chris Portman) 7 - Pass environment variables to Unicorn and Sidekiq (Chris Portman)
8 - Add openssl_verify_mode to SMTP email configuration (Dionysius Marquis) 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 7.1.0 11 7.1.0
11 - Build: explicitly use .forward for sending notifications 12 - Build: explicitly use .forward for sending notifications
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @0d71290
@@ -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 @0d71290
@@ -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