Download as
Browse Code »

Commit e04b96594240bd2adf0e7b2ee93b69bfa497545f

Authored by Jacob Vosmaer
2 parents 86cdf0f3 344d9938
Exists in master and in 11 other branches 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'change_ssh_port' into 'master' 

Change ssh port

this adds a parameter to change the ssh port. useful behind firewalls.
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @e04b965
@@ -96,6 +96,7 @@ default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/ @@ -96,6 +96,7 @@ default['gitlab']['gitlab-rails']['gitlab_shell_repos_path'] = "/var/opt/gitlab/
96 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/" 96 default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks/"
97 default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true 97 default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = true
98 default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true 98 default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = true
  99 +default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22
99 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git" 100 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
100 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880 101 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880
101 default['gitlab']['gitlab-rails']['git_timeout'] = 10 102 default['gitlab']['gitlab-rails']['git_timeout'] = 10
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @e04b965
@@ -212,7 +212,7 @@ production: &base @@ -212,7 +212,7 @@ production: &base
212 receive_pack: <%= @gitlab_shell_receive_pack %> 212 receive_pack: <%= @gitlab_shell_receive_pack %>
213 213
214 # If you use non-standard ssh port you need to specify it 214 # If you use non-standard ssh port you need to specify it
215 - # ssh_port: 22 215 + ssh_port: <%= @gitlab_shell_ssh_port %>
216 216
217 ## Git settings 217 ## Git settings
218 # CAUTION! 218 # CAUTION!