diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-09 20:32:15 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-09 20:32:15 +0000 |
| commit | 16063496add4c5590bb0ea6c79e9e048127464c1 (patch) | |
| tree | 7a79edefeba086a79a5266e1ec3bbe910bd71e21 | |
| parent | e4038cb5085522cfc648e78d105ed27b79c131a8 (diff) | |
| parent | f1e4376fb9174fa050412e417381e39560be6ef1 (diff) | |
| download | gitlab-ce-16063496add4c5590bb0ea6c79e9e048127464c1.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/dm-mail-room-check-without-omnibus.yml | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/changelogs/unreleased/dm-mail-room-check-without-omnibus.yml b/changelogs/unreleased/dm-mail-room-check-without-omnibus.yml new file mode 100644 index 00000000000..7fd252e9b8b --- /dev/null +++ b/changelogs/unreleased/dm-mail-room-check-without-omnibus.yml @@ -0,0 +1,4 @@ +--- +title: Don't check if MailRoom is running on Omnibus +merge_request: +author: diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 63c5e9b9c83..858f1cd7b34 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -336,12 +336,9 @@ namespace :gitlab do ######################## def check_initd_configured_correctly - print "Init.d configured correctly? ... " + return if omnibus_gitlab? - if omnibus_gitlab? - puts 'skipped (omnibus-gitlab has no init script)'.color(:magenta) - return - end + print "Init.d configured correctly? ... " path = "/etc/default/gitlab" @@ -379,6 +376,8 @@ namespace :gitlab do end def check_mail_room_running + return if omnibus_gitlab? + print "MailRoom running? ... " path = "/etc/default/gitlab" |