Revert "Limit the memory used by renderd"

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 5299a3e381fe614b3dbc4941f9d1459f36bd4421..0f8cd93035b3ce41eb4ad018d72a06014d5cefb6 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -274,8 +274,10 @@ nodejs_package "carto"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
+  conflicts "render-lowzoom.service"
   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
+  runtime_directory "update-lowzoom-%i"
   private_tmp true
   private_devices true
   private_network true
@@ -434,20 +436,11 @@ package %w[
 
 if node[:tile][:database][:external_data_script]
   execute node[:tile][:database][:external_data_script] do
-    command node[:tile][:database][:external_data_script]
+    command "#{node[:tile][:database][:external_data_script]} -R www-data"
     cwd "/srv/tile.openstreetmap.org"
     user "tile"
     group "tile"
   end
-
-  Array(node[:tile][:database][:external_data_tables]).each do |table|
-    postgresql_table table do
-      cluster node[:tile][:database][:cluster]
-      database "gis"
-      owner "tile"
-      permissions "tile" => :all, "www-data" => :select
-    end
-  end
 end
 
 postgresql_munin "gis" do
@@ -578,6 +571,7 @@ end
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"
+  condition_path_exists_glob "!/run/update-lowzoom-*"
   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true