X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8d7f3bd070a2ffe8a86e79299be37da9c687dee5..df3d14c275bd4c15de12ae96d9155e9d2b93e5ee:/cookbooks/web/definitions/rails_port.rb diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 51a56e9e7..6773cf974 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -44,6 +44,7 @@ define :rails_port, :action => [:create, :enable] do package "irb#{ruby_version}" if ruby_version.to_f < 1.9 package "imagemagick" package "nodejs" + package "geoip-database" package "g++" package "pkg-config" @@ -122,6 +123,8 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"") + line.gsub!(/^( *)#geoip_database:.*$/, "\\1geoip_database: \"/usr/share/GeoIP/GeoIPv6.dat\"") + if params[:gpx_dir] line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"") line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"")