summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-09-22 23:32:35 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2015-09-22 23:32:35 +0200
commit03fd5919a393b8784c601c76c3ed65912f4b522a (patch)
treef10f01e1abfc517bea45b2c7631e479b556fa87e /lib
parente34f18a8d830d6f261080d1c78e41aa685743a25 (diff)
parent4ad9b49a14885e7a08473280e9d7a176edf0fe78 (diff)
downloadgitlab-ce-03fd5919a393b8784c601c76c3ed65912f4b522a.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
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")