Download as
Browse Code »

Commit e54b457ea31eff54d031b7092a2a78dc81c69a63

Authored by Dmitriy Zaporozhets
1 parent 2134e18e
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Improve ssh_host settings

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
config/initializers/1_settings.rb
  Diff comments   View file @e54b457
@@ -73,7 +73,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 @@ -73,7 +73,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
73 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? 73 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
74 Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil? 74 Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil?
75 Settings.gitlab['host'] ||= 'localhost' 75 Settings.gitlab['host'] ||= 'localhost'
76 -Settings.gitlab['ssh_host'] ||= 'localhost' 76 +Settings.gitlab['ssh_host'] ||= Settings.gitlab.host
77 Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? 77 Settings.gitlab['https'] = false if Settings.gitlab['https'].nil?
78 Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 78 Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
79 Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' 79 Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
@@ -118,7 +118,7 @@ Settings.gitlab_shell['hooks_path'] ||= Settings.gitlab['user_home'] + '/gitla @@ -118,7 +118,7 @@ Settings.gitlab_shell['hooks_path'] ||= Settings.gitlab['user_home'] + '/gitla
118 Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil? 118 Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil?
119 Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil? 119 Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil?
120 Settings.gitlab_shell['repos_path'] ||= Settings.gitlab['user_home'] + '/repositories/' 120 Settings.gitlab_shell['repos_path'] ||= Settings.gitlab['user_home'] + '/repositories/'
121 -Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.ssh_host || Settings.gitlab.host || 'localhost') 121 +Settings.gitlab_shell['ssh_host'] ||= Settings.gitlab.ssh_host
122 Settings.gitlab_shell['ssh_port'] ||= 22 122 Settings.gitlab_shell['ssh_port'] ||= 22
123 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user 123 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user
124 Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user 124 Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user