Commit 16063496 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'dm-mail-room-check-without-omnibus' into 'master'

Don't check if MailRoom is running on Omnibus

Closes #19607

See merge request !12056
parents e4038cb5 f1e4376f
Pipeline #8904583 failed with stages
in 66 minutes and 22 seconds
---
title: Don't check if MailRoom is running on Omnibus
merge_request:
author:
...@@ -336,12 +336,9 @@ namespace :gitlab do ...@@ -336,12 +336,9 @@ namespace :gitlab do
######################## ########################
def check_initd_configured_correctly def check_initd_configured_correctly
print "Init.d configured correctly? ... " return if omnibus_gitlab?
if omnibus_gitlab? print "Init.d configured correctly? ... "
puts 'skipped (omnibus-gitlab has no init script)'.color(:magenta)
return
end
path = "/etc/default/gitlab" path = "/etc/default/gitlab"
...@@ -379,6 +376,8 @@ namespace :gitlab do ...@@ -379,6 +376,8 @@ namespace :gitlab do
end end
def check_mail_room_running def check_mail_room_running
return if omnibus_gitlab?
print "MailRoom running? ... " print "MailRoom running? ... "
path = "/etc/default/gitlab" path = "/etc/default/gitlab"
......
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