diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e5c1e324e69..435cc668f1e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,6 +31,7 @@ v 7.0.0 - Add notice about huge push over http to unicorn config - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one - Overall performance improvements + - Skip init script check on omnibus-gitlab v 6.9.2 - Revert the commit that broke the LDAP user filter diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 00af8d10291..34116568e99 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -123,6 +123,11 @@ namespace :gitlab do def check_init_script_exists print "Init script exists? ... " + if omnibus_gitlab? + puts 'skipped (omnibus-gitlab has no init script)'.magenta + return + end + script_path = "/etc/init.d/gitlab" if File.exists?(script_path) @@ -142,6 +147,11 @@ namespace :gitlab do def check_init_script_up_to_date print "Init script up-to-date? ... " + if omnibus_gitlab? + puts 'skipped (omnibus-gitlab has no init script)'.magenta + return + end + recipe_path = Rails.root.join("lib/support/init.d/", "gitlab") script_path = "/etc/init.d/gitlab" @@ -823,4 +833,8 @@ namespace :gitlab do fix_and_rerun end end + + def omnibus_gitlab? + Dir.pwd == '/opt/gitlab/embedded/service/gitlab-rails' + end end |