X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cfa0fe92774c9dfcf0a0085d7772319550066ed7..511455efa74f41eff350f6799ae44a08498f15fa:/cookbooks/web/resources/rails_port.rb diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index fbf4aeb0b..e92c03bd4 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -341,7 +341,7 @@ 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" => "#{node[:geoipupdate][:directory]}/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], @@ -484,7 +484,7 @@ action :restart do end action_class do - include Chef::Mixin::EditFile + include OpenStreetMap::Mixin::EditFile def rails_directory new_resource.directory || "/srv/#{new_resource.site}"