tjh.dev
1diff --git a/config/environments/production.rb b/config/environments/production.rb
2index 9095266..694a4c5 100644
3--- a/config/environments/production.rb
4+++ b/config/environments/production.rb
5@@ -67,10 +67,10 @@ Rails.application.configure do
6
7 config.action_mailer.delivery_method = :sendmail
8 # Defaults to:
9- # # config.action_mailer.sendmail_settings = {
10- # # location: '/usr/sbin/sendmail',
11- # # arguments: '-i -t'
12- # # }
13+ config.action_mailer.sendmail_settings = {
14+ location: '/var/setuid-wrappers/sendmail',
15+ arguments: '-i -t'
16+ }
17 config.action_mailer.perform_deliveries = true
18 config.action_mailer.raise_delivery_errors = true
19
20diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
21index 05f127d..6a4ae68 100644
22--- a/config/gitlab.yml.example
23+++ b/config/gitlab.yml.example
24@@ -423,7 +423,7 @@ production: &base
25 # CAUTION!
26 # Use the default values unless you really know what you are doing
27 git:
28- bin_path: /usr/bin/git
29+ bin_path: git
30 # The next value is the maximum memory size grit can use
31 # Given in number of bytes per git object (e.g. a commit)
32 # This value can be increased if you have very large commits
33diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
34index 59b2114..4f4a39a 100644
35--- a/lib/gitlab/logger.rb
36+++ b/lib/gitlab/logger.rb
37@@ -13,20 +13,20 @@ module Gitlab
38 end
39
40 def self.read_latest
41- path = Rails.root.join("log", file_name)
42+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
43 self.build unless File.exist?(path)
44 tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
45 tail_output.split("\n")
46 end
47
48 def self.read_latest_for(filename)
49- path = Rails.root.join("log", filename)
50+ path = File.join(ENV["GITLAB_LOG_PATH"], filename)
51 tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
52 tail_output.split("\n")
53 end
54
55 def self.build
56- new(Rails.root.join("log", file_name))
57+ new(File.join(ENV["GITLAB_LOG_PATH"], file_name))
58 end
59 end
60 end
61diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
62index be8fcc7..7642d74 100644
63--- a/lib/gitlab/uploads_transfer.rb
64+++ b/lib/gitlab/uploads_transfer.rb
65@@ -29,7 +29,7 @@ module Gitlab
66 end
67
68 def root_dir
69- File.join(Rails.root, "public", "uploads")
70+ ENV['GITLAB_UPLOADS_PATH'] || File.join(Rails.root, "public", "uploads")
71 end
72 end
73 end
74diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
75index d59872d..0b8007f 100644
76--- a/lib/tasks/gitlab/check.rake
77+++ b/lib/tasks/gitlab/check.rake
78@@ -223,7 +223,7 @@ namespace :gitlab do
79 def check_log_writable
80 print "Log directory writable? ... "
81
82- log_path = Rails.root.join("log")
83+ log_path = ENV["GITLAB_LOG_PATH"]
84
85 if File.writable?(log_path)
86 puts "yes".green
87@@ -263,10 +263,12 @@ namespace :gitlab do
88 def check_uploads
89 print "Uploads directory setup correctly? ... "
90
91- unless File.directory?(Rails.root.join('public/uploads'))
92+ uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
93+
94+ unless File.directory?(uploads_dir)
95 puts "no".red
96 try_fixing_it(
97- "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
98+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
99 )
100 for_more_information(
101 see_installation_guide_section "GitLab"
102@@ -275,7 +277,7 @@ namespace :gitlab do
103 return
104 end
105
106- upload_path = File.realpath(Rails.root.join('public/uploads'))
107+ upload_path = File.realpath(Rails.root.join(uploads_dir))
108 upload_path_tmp = File.join(upload_path, 'tmp')
109
110 if File.stat(upload_path).mode == 040700