Add metric for idle postgres processes

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 14a9c0bfb59ba4df2eef721214777b2c487c3d92..e92c03bd4bf298cccbb1173716989c51a9f8a2a5 100644 (file)
--- 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",
     "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],
     "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],


@@ -405,10 +405,6 @@ action :create do
     only_if { new_resource.run_migrations }
   end
 
     only_if { new_resource.run_migrations }
   end
 

-  package "yarnpkg" do
-    only_if { new_resource.build_assets }
-  end
-

   bundle_exec "#{rails_directory}/package.json" do
     action :nothing
     directory rails_directory
   bundle_exec "#{rails_directory}/package.json" do
     action :nothing
     directory rails_directory


@@ -488,7 +484,7 @@ action :restart do
 end
 
 action_class do
 end
 
 action_class do

-  include Chef::Mixin::EditFile
+  include OpenStreetMap::Mixin::EditFile

 
   def rails_directory
     new_resource.directory || "/srv/#{new_resource.site}"
 
   def rails_directory
     new_resource.directory || "/srv/#{new_resource.site}"