Guard against a missing gitlab-rails env directory

Jacob Vosmaer
1 parent 052b979e
Showing 1 changed file with 8 additions and 6 deletions Show diff stats
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -164,12 +164,14 @@ env_vars.each do |key, value|
   end
 end
  
-deleted_env_vars = Dir.entries(gitlab_rails_env_dir) - env_vars.keys - %w{. ..}
-deleted_env_vars.each do |deleted_var|
-  file deleted_var do
-    action :delete
-    notifies :restart, "service[unicorn]"
-    notifies :restart, "service[sidekiq]"
+if File.directory?(gitlab_rails_env_dir)
+  deleted_env_vars = Dir.entries(gitlab_rails_env_dir) - env_vars.keys - %w{. ..}
+  deleted_env_vars.each do |deleted_var|
+    file deleted_var do
+      action :delete
+      notifies :restart, "service[unicorn]"
+      notifies :restart, "service[sidekiq]"
+    end
   end
 end
...	...	@@ -164,12 +164,14 @@ env_vars.each do \|key, value\|
164	164	end
165	165	end
166	166
167		-deleted_env_vars = Dir.entries(gitlab_rails_env_dir) - env_vars.keys - %w{. ..}
168		-deleted_env_vars.each do \|deleted_var\|
169		- file deleted_var do
170		- action :delete
171		- notifies :restart, "service[unicorn]"
172		- notifies :restart, "service[sidekiq]"
	167	+if File.directory?(gitlab_rails_env_dir)
	168	+ deleted_env_vars = Dir.entries(gitlab_rails_env_dir) - env_vars.keys - %w{. ..}
	169	+ deleted_env_vars.each do \|deleted_var\|
	170	+ file deleted_var do
	171	+ action :delete
	172	+ notifies :restart, "service[unicorn]"
	173	+ notifies :restart, "service[sidekiq]"
	174	+ end
173	175	end
174	176	end
175	177
...	...