Warn if tile expiry doesn't manage to delete enough tiles

[chef.git] / cookbooks / web / recipes / rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index cd8bb9b568bda3d08530626a50cdcdc6e75bf798..ca27a5081d98478e0988c21b7de21c9408c196a7 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -61,6 +61,10 @@ end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
+piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k,v|
+  ["chef_type", "data_bag", "id"].include?(k)
+end
+
 rails_port "www.openstreetmap.org" do
   ruby node[:web][:ruby_version]
   directory rails_directory
@@ -86,7 +90,5 @@ rails_port "www.openstreetmap.org" do
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
-  piwik_location "piwik.openstreetmap.org"
-  piwik_site 1
-  piwik_signup_goal 1
+  piwik_configuration piwik_configuration
 end