Make tilecache cookbook enable nginx cache automatically

diff --git a/cookbooks/tilecache/attributes/default.rb b/cookbooks/tilecache/attributes/default.rb
index a552ee6fc2a22e7f52703c5db00cf16b3884d9e2..56f490e86f68b5dba038f8fcd47a7c04b371f821 100644 (file)
--- a/cookbooks/tilecache/attributes/default.rb
+++ b/cookbooks/tilecache/attributes/default.rb
@@ -9,3 +9,6 @@ default[:tilecache][:ip_bucket_size] = 67108864
 default[:tilecache][:net_bucket_refill] = 8192
 # Per Class C bucket size
 default[:tilecache][:net_bucket_size] = 134217728
 default[:tilecache][:net_bucket_refill] = 8192
 # Per Class C bucket size
 default[:tilecache][:net_bucket_size] = 134217728

+
+# Enable nginx cache
+default[:nginx][:cache][:proxy][:enable] = true

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index d0d14f751bb71620c0666e9e7d3df5603860de2a..a78cac73d107b1ca67666fd469da117ccb45206e 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -13,13 +13,7 @@ default_attributes(
     :tcp_fastopen_key => "tile"
   },
   :nginx => {
     :tcp_fastopen_key => "tile"
   },
   :nginx => {

-    :access_log => false,
-    :cache => {
-      :proxy => {
-        :enable => true,
-        :keys_zone => "proxy_cache_zone:128M"
-      }
-    }
+    :access_log => false

   },
   :sysctl => {
     :sockets => {
   },
   :sysctl => {
     :sockets => {