Download as
Browse Code »

Commit cd6909178aaf632793d3678ec859dff949dcb379

Authored by Jacob Vosmaer
1 parent 69b90eb4
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

Fix typos

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @cd69091
... ... @@ -69,7 +69,7 @@ include_recipe "runit"
69 69 "postgresql", # Postgresql depends on Redis because of `rake db:seed_fu`
70 70 "unicorn",
71 71 "sidekiq",
72   - "nginx"
  72 + "nginx",
73 73 "bootstrap",
74 74 ].each do |service|
75 75 if node["gitlab"][service]["enable"]
... ...
files/gitlab-cookbooks/gitlab/recipes/nginx.rb
  Diff comments   View file @cd69091
... ... @@ -37,7 +37,7 @@ nginx_vars = node['gitlab']['nginx'].to_hash.merge({
37 37 :gitlab_http_config => File.join(nginx_etc_dir, "gitlab-http.conf"),
38 38 })
39 39  
40   -template gitlab_http_config do
  40 +template nginx_vars[gitlab_http_config] do
41 41 source "nginx-gitlab-http.conf.erb"
42 42 owner "root"
43 43 group "root"
... ...
files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
  Diff comments   View file @cd69091
... ... @@ -23,5 +23,5 @@ http {
23 23  
24 24 include /opt/gitlab/embedded/conf/mime.types;
25 25  
26   - include <%= @gitlab_http_config %>
  26 + include <%= @gitlab_http_config %>;
27 27 }
... ...