Download as
Browse Code »

Commit c698bc7d9e27c2fcf2f9b01b50ee35fed33fd564

Authored by Dmitriy Zaporozhets
2 parents cd5685ca 719f7231
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4037 from mitchty/master 

Remove user directory path assumptions
Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
config/initializers/1_settings.rb
  Diff comments   View file @c698bc7
@@ -60,6 +60,11 @@ Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" @@ -60,6 +60,11 @@ Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
60 Settings.gitlab['support_email'] ||= Settings.gitlab.email_from 60 Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
61 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) 61 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
62 Settings.gitlab['user'] ||= 'git' 62 Settings.gitlab['user'] ||= 'git'
  63 +Settings.gitlab['user_home'] ||= begin
  64 + Etc.getpwnam(Settings.gitlab['user']).dir
  65 +rescue ArgumentError # no user configured
  66 + '/home/' + Settings.gitlab['user']
  67 +end
63 Settings.gitlab['signup_enabled'] ||= false 68 Settings.gitlab['signup_enabled'] ||= false
64 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? 69 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
65 Settings.gitlab['default_projects_features'] ||= {} 70 Settings.gitlab['default_projects_features'] ||= {}
@@ -81,10 +86,10 @@ Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}? @@ -81,10 +86,10 @@ Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?
81 # GitLab Shell 86 # GitLab Shell
82 # 87 #
83 Settings['gitlab_shell'] ||= Settingslogic.new({}) 88 Settings['gitlab_shell'] ||= Settingslogic.new({})
84 -Settings.gitlab_shell['hooks_path'] ||= '/home/git/gitlab-shell/hooks/' 89 +Settings.gitlab_shell['hooks_path'] ||= Settings.gitlab['user_home'] + '/gitlab-shell/hooks/'
85 Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil? 90 Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil?
86 Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil? 91 Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil?
87 -Settings.gitlab_shell['repos_path'] ||= '/home/git/repositories/' 92 +Settings.gitlab_shell['repos_path'] ||= Settings.gitlab['user_home'] + '/repositories/'
88 Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.host || 'localhost') 93 Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.host || 'localhost')
89 Settings.gitlab_shell['ssh_port'] ||= 22 94 Settings.gitlab_shell['ssh_port'] ||= 22
90 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user 95 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user