diff options
author | Dmitri Moore <demisxbar@gmail.com> | 2014-04-18 20:13:53 -0700 |
---|---|---|
committer | Dmitri Moore <demisxbar@gmail.com> | 2014-04-18 20:20:43 -0700 |
commit | db86fe47ce42f8f5aa72cc52d07c7e6eb312dcf9 (patch) | |
tree | 8a18d57bbcb3e0ad487e52827f0c30f38124cb2a /config/initializers/1_settings.rb | |
parent | 9b7dd8b4c04c427de22543fec7f52be26decdb22 (diff) | |
download | gitlab-ce-db86fe47ce42f8f5aa72cc52d07c7e6eb312dcf9.tar.gz |
Add ability to set different ssh host, if different from http/https
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 59564d9ea33..82a08241e01 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -117,7 +117,7 @@ Settings.gitlab_shell['hooks_path'] ||= Settings.gitlab['user_home'] + '/gitla Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil? Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil? Settings.gitlab_shell['repos_path'] ||= Settings.gitlab['user_home'] + '/repositories/' -Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.host || 'localhost') +Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.ssh_host || Settings.gitlab.host || 'localhost') Settings.gitlab_shell['ssh_port'] ||= 22 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user |