Merge branch 'detect_omnibus' into 'master'
Detect omnibus-gitlab in `rake gitlab:check`
This commit is contained in:
commit
11e1c01341
2 changed files with 15 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue