Make nginx cookbook default to using the nginx upstream repository

[chef.git] / cookbooks / nginx / recipes / default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 853f8e5a7402e2fd59a0ef1b97fc8edacefc43c5..94754546c257168b12a16a807d560a3066e21058 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
+include_recipe "munin"
+
 package "nginx"
 
 resolvers = node[:networking][:nameservers].map do |resolver|
@@ -31,31 +34,19 @@ template "/etc/nginx/nginx.conf" do
   variables :resolvers => resolvers
 end
 
-directory "/var/cache/nginx/fastcgi-cache" do
+directory node[:nginx][:cache][:fastcgi][:directory] do
   owner "www-data"
   group "root"
   mode 0o755
+  recursive true
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
-directory "/var/cache/nginx/proxy-cache" do
+directory node[:nginx][:cache][:proxy][:directory] do
   owner "www-data"
   group "root"
   mode 0o755
-  only_if { node[:nginx][:cache][:proxy][:enable] }
-end
-
-# Temporary Cleanup to remove old levels=1:2 cache after migration to 2:2:2
-execute "nginx-remove-old-fastcgi-cache" do
-  command "/usr/bin/find /var/cache/nginx/fastcgi-cache/ -mindepth 3 -maxdepth 3 -type f -delete"
-  ignore_failure true
-  only_if { node[:nginx][:cache][:fastcgi][:enable] }
-end
-
-# Temporary Cleanup to remove old levels=1:2 cache after migration to 2:2:2
-execute "nginx-remove-old-proxy-cache" do
-  command "/usr/bin/find /var/cache/nginx/proxy-cache/ -mindepth 3 -maxdepth 3 -type f -delete"
-  ignore_failure true
+  recursive true
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end