summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-09-22 22:56:49 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-09-22 17:00:47 -0400
commit9911f86c3d76b75bfd673aaa4b7f115cd3f8be04 (patch)
treeb9fd2162d15f312bc1e26dc204342fa26bcd5897 /lib
parent73df99f700cb1d7a41103dc28af8b1ba888a8215 (diff)
downloadgitlab-ce-9911f86c3d76b75bfd673aaa4b7f115cd3f8be04.tar.gz
Skip check_initd_configured_correctly on omnibus installs
This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail.
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/check.rake5
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")