Download as
Browse Code »

Commit d7e4a3b669dcf38f5c03e193e5ddf0bbbb6bce8e

Authored by Jacob Vosmaer
2 parents 83299adc ff17962d
Exists in 6-9-stable-ee

Merge branch '6-9-stable' into 6-9-stable-ee

Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
config/software/gitlab-cookbooks.rb
  Diff comments   View file @d7e4a3b
... ... @@ -20,6 +20,8 @@ name "gitlab-cookbooks"
20 20  
21 21 dependency "rsync"
22 22  
  23 +always_build true
  24 +
23 25 source :path => File.expand_path("files/gitlab-cookbooks", Omnibus.project_root)
24 26  
25 27 build do
... ...
files/gitlab-cookbooks/runit/recipes/default.rb
  Diff comments   View file @d7e4a3b
... ... @@ -19,7 +19,12 @@
19 19  
20 20 case node["platform_family"]
21 21 when "debian"
22   - include_recipe "runit::upstart"
  22 + case node["platform"]
  23 + when "debian"
  24 + include_recipe "runit::sysvinit"
  25 + else
  26 + include_recipe "runit::upstart"
  27 + end
23 28 when "rhel"
24 29 case node["platform"]
25 30 when "amazon", "xenserver"
... ...