X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/311468161683c37f71eae1bbfe8086630c83755c..894fc2a3cb251dc3ebbdadce96c1f1783ec44d37:/cookbooks/web/resources/rails_port.rb?ds=sidebyside diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index be979d693..e4e206ae5 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -51,6 +51,7 @@ property :logstash_path, String property :memcache_servers, Array property :potlatch2_key, String property :id_key, String +property :id_application, String property :oauth_key, String property :oauth_application, String property :nominatim_url, String @@ -221,6 +222,10 @@ action :create do line.gsub!(/^( *)#id_key:.*$/, "\\1id_key: \"#{new_resource.id_key}\"") end + if new_resource.id_application + line.gsub!(/^( *)#id_application:.*$/, "\\1id_application: \"#{new_resource.id_application}\"") + end + if new_resource.oauth_key line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{new_resource.oauth_key}\"") end @@ -310,6 +315,7 @@ action :create do "logstash_path", "potlatch2_key", "id_key", + "id_application", "oauth_key", "oauth_application", "nominatim_url", @@ -347,7 +353,11 @@ action :create do "support_email" => "support@openstreetmap.org", "email_return_path" => "bounces@openstreetmap.org", "geonames_username" => "openstreetmap", - "maxmind_database" => "/usr/share/GeoIP/GeoLite2-Country.mmdb" + "maxmind_database" => "/usr/share/GeoIP/GeoLite2-Country.mmdb", + "max_request_area" => node[:web][:max_request_area], + "max_number_of_nodes" => node[:web][:max_number_of_nodes], + "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes], + "max_number_of_relation_members" => node[:web][:max_number_of_relation_members] ) if new_resource.memcache_servers