diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-22 20:16:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-22 20:16:51 +0000 |
| commit | e500be831007f5cf6acdb91b1171bbc8a3fd3cfe (patch) | |
| tree | 2464b01289a80a511dbfceacf7ec5b503bf22db9 | |
| parent | 37ecae33ecae95fd2e27bf1e1f479c32e11de5f4 (diff) | |
| parent | 110e90c855681967b051a1b811c1bf9df2f38dbd (diff) | |
| download | gitlab-ce-e500be831007f5cf6acdb91b1171bbc8a3fd3cfe.tar.gz | |
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
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index c8222f8ce11..66f1ecf385f 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -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") |