Commit e500be83 authored by Douwe Maan's avatar Douwe Maan
Browse files

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
......@@ -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")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment