Download as
Browse Code »

Commit 40e2ddf76ac63823ec8bb9eeec6570193e272f8a

Authored by Jacob Vosmaer
1 parent 1a5d0a7f
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Enable nginx service

Showing 2 changed files with 3 additions and 0 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
  Diff comments   View file @40e2ddf
@@ -31,6 +31,7 @@ module Gitlab @@ -31,6 +31,7 @@ module Gitlab
31 gitlab_rails Mash.new 31 gitlab_rails Mash.new
32 unicorn Mash.new 32 unicorn Mash.new
33 sidekiq Mash.new 33 sidekiq Mash.new
  34 + nginx Mash.new
34 node nil 35 node nil
35 36
36 class << self 37 class << self
@@ -79,6 +80,7 @@ module Gitlab @@ -79,6 +80,7 @@ module Gitlab
79 "gitlab_rails", 80 "gitlab_rails",
80 "unicorn", 81 "unicorn",
81 "sidekiq", 82 "sidekiq",
  83 + "nginx",
82 "postgresql" 84 "postgresql"
83 ].each do |key| 85 ].each do |key|
84 rkey = key.gsub('_', '-') 86 rkey = key.gsub('_', '-')
files/gitlab-cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @40e2ddf
@@ -69,6 +69,7 @@ include_recipe &quot;runit&quot; @@ -69,6 +69,7 @@ include_recipe &quot;runit&quot;
69 "postgresql", # Postgresql depends on Redis because of `rake db:seed_fu` 69 "postgresql", # Postgresql depends on Redis because of `rake db:seed_fu`
70 "unicorn", 70 "unicorn",
71 "sidekiq", 71 "sidekiq",
  72 + "nginx"
72 "bootstrap", 73 "bootstrap",
73 ].each do |service| 74 ].each do |service|
74 if node["gitlab"][service]["enable"] 75 if node["gitlab"][service]["enable"]