tilecache: restrict cache control headers to osm.org only

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index ade13504d442c513ac861ca255553fdd5aa24588..93aab56906afd96dabce0acc328ffbc0a3ff5a62 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -31,17 +31,19 @@ template "/etc/nginx/nginx.conf" do
   variables :resolvers => resolvers
 end
 
   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
   owner "www-data"
   group "root"
   mode 0o755

+  recursive true

   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
   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
   owner "www-data"
   group "root"
   mode 0o755

+  recursive true

   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 


@@ -55,5 +57,7 @@ munin_plugin_conf "nginx" do
   template "munin.erb"
 end
 
   template "munin.erb"
 end
 

+package "libwww-perl"
+

 munin_plugin "nginx_request"
 munin_plugin "nginx_status"
 munin_plugin "nginx_request"
 munin_plugin "nginx_status"