Update piwik to 3.1.0

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 725f3b746533c41f1d31757079b682e6f1fe1799..0a96ddf6d5aeedbf0356e6890e34029efe31793e 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -31,6 +31,8 @@ db_passwords = data_bag_item("db", "passwords")
 ssl_certificate "www.openstreetmap.org" do
   domains ["www.openstreetmap.org", "www.osm.org",
            "api.openstreetmap.org", "api.osm.org",
 ssl_certificate "www.openstreetmap.org" do
   domains ["www.openstreetmap.org", "www.osm.org",
            "api.openstreetmap.org", "api.osm.org",

+           "maps.openstreetmap.org", "maps.osm.org",
+           "mapz.openstreetmap.org", "mapz.osm.org",

            "openstreetmap.org", "osm.org"]
   notifies :reload, "service[apache2]"
 end
            "openstreetmap.org", "osm.org"]
   notifies :reload, "service[apache2]"
 end


@@ -48,7 +50,7 @@ end
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _|
 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)
+  %w[chef_type data_bag id].include?(k)

 end
 
 rails_port "www.openstreetmap.org" do
 end
 
 rails_port "www.openstreetmap.org" do