From 344d99383dd9974449d58f2967d10df3d8099bd0 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Wed, 7 May 2014 11:25:46 +0200 Subject: [PATCH] allow specifying the gitlab ssh port --- 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 35e3f3f..92d4493 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -96,6 +96,7 @@ default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/ default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/" default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true +default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git" default['gitlab']['gitlab-rails']['git_max_size'] = 5242880 default['gitlab']['gitlab-rails']['git_timeout'] = 10 diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 1dd73c7..645f39c 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -212,7 +212,7 @@ production: &base receive_pack: <%= @gitlab_shell_receive_pack %> # If you use non-standard ssh port you need to specify it - # ssh_port: 22 + ssh_port: <%= @gitlab_shell_ssh_port %> ## Git settings # CAUTION! -- libgit2 0.21.2