summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-09-22 22:56:49 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-09-22 22:56:49 +0300
commit110e90c855681967b051a1b811c1bf9df2f38dbd (patch)
tree37de7b70fedfcf7fb8c3bc84fa1e1de10d3acfee /lib
parent9e1392553b0d87d571252838d8b7b9d8cd411565 (diff)
downloadgitlab-ce-110e90c855681967b051a1b811c1bf9df2f38dbd.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")