Fix typos

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