Coerce piwik goals into a normal hash

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index af4c8d61382aaef3f6e07d0d53cfc292bcc96326..d10f70c57db28663da59948d71e18a57be5871fc 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -49,9 +49,7 @@ end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
-piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _|
-  %w[chef_type data_bag id].include?(k)
-end
+piwik = data_bag_item("web", "piwik")
 
 rails_port "www.openstreetmap.org" do
   ruby node[:passenger][:ruby_version]
@@ -75,7 +73,9 @@ 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_configuration piwik_configuration
+  piwik_configuration :location => piwik[:location],
+                      :site => piwik[:site],
+                      :goals => piwik[:goals].to_hash
   google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
   google_auth_secret web_passwords["google_auth_secret"]
   google_openid_realm "https://www.openstreetmap.org"