X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cfcf5640dfd4f192afac921a687459c071db400d..21958591555b0b80370e944e3128ac5d533c281d:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 4731cc1e6..6616c49f0 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -37,8 +37,8 @@ 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) +piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _| + %w(chef_type data_bag id).include?(k) end rails_port "www.openstreetmap.org" do @@ -62,10 +62,9 @@ rails_port "www.openstreetmap.org" do gpx_dir "/store/rails/gpx" attachments_dir "/store/rails/attachments" log_path "#{node[:web][:log_directory]}/rails.log" - memcache_servers [ "rails1", "rails2", "rails3" ] + memcache_servers %w(rails1 rails2 rails3) potlatch2_key web_passwords["potlatch2_key"] id_key web_passwords["id_key"] oauth_key web_passwords["oauth_key"] piwik_configuration piwik_configuration - nominatim_url "http://open.mapquestapi.com/nominatim/v1/" end