mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 13:46:11 +10:00
Merge branch 'exclude_initd_rake_check_when_omnibus' into 'master'
Skip check_initd_configured_correctly on omnibus installs This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail. See merge request !1396
This commit is contained in:
@@ -679,6 +679,11 @@ namespace :gitlab do
|
||||
def check_initd_configured_correctly
|
||||
print "Init.d configured correctly? ... "
|
||||
|
||||
if omnibus_gitlab?
|
||||
puts 'skipped (omnibus-gitlab has no init script)'.magenta
|
||||
return
|
||||
end
|
||||
|
||||
path = "/etc/default/gitlab"
|
||||
|
||||
if File.exist?(path) && File.read(path).include?("mail_room_enabled=true")
|
||||
|
||||
Reference in New Issue
Block a user