From 516c22441a33d1f053aeb0b2d5a1b686e2863f60 Mon Sep 17 00:00:00 2001 From: Florent Baldino Date: Fri, 1 Aug 2014 10:54:12 +0200 Subject: [PATCH] Add 'gitlab_ssh_host' for gitlab.rb --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 1 + files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 747a29f..669f374 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -54,6 +54,7 @@ default['gitlab']['gitlab-rails']['rate_limit_period'] = 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 diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 21744bc..c2dce52 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -17,7 +17,7 @@ production: &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 -- libgit2 0.21.2