X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/481864ed956365260fa7ae05ac18248ae168f4cd..00bc7e2e46dba86663711b6b020d509ca64ed089:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 19d266f50..8c7c63373 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -97,6 +97,10 @@ file "/srv/tile.openstreetmap.org/conf/ip.map" do
   mode "644"
 end
 
+tile_directories = node[:tile][:styles].collect do |_, style|
+  style[:tile_directories].collect { |directory| directory[:name] }
+end.flatten.sort.uniq
+
 package "renderd"
 
 systemd_service "renderd" do
@@ -104,19 +108,12 @@ systemd_service "renderd" do
   after "postgresql.service"
   wants "postgresql.service"
   limit_nofile 4096
-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths tile_directories
   restart "on-failure"
 end
 
-systemd_service "renderd" do
-  action :delete
-end
-
 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"
@@ -186,11 +183,22 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   mode "755"
 end
 
-template "/etc/cron.hourly/export" do
-  source "export.cron.erb"
-  owner "root"
-  group "root"
-  mode "755"
+systemd_service "export-cleanup" do
+  description "Cleanup stale export temporary files"
+  joins_namespace_of "apache2.service"
+  exec_start "find /tmp -ignore_readdir_race -name 'export??????' -mmin +60 -delete"
+  user "www-data"
+  sandbox true
+end
+
+systemd_timer "export-cleanup" do
+  description "Cleanup stale export temporary files"
+  on_boot_sec "60m"
+  on_unit_inactive_sec "60m"
+end
+
+service "export-cleanup.timer" do
+  action [:enable, :start]
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
@@ -275,20 +283,16 @@ 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_pre "+/bin/systemctl stop render-lowzoom.service"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   runtime_directory "update-lowzoom-%i"
-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "strict"
-  protect_home true
+  sandbox true
+  restrict_address_families "AF_UNIX"
   read_write_paths [
     "/srv/tile.openstreetmap.org/tiles/%i",
     "/var/log/tile"
   ]
-  no_new_privileges true
   restart "on-failure"
 end
 
@@ -545,13 +549,8 @@ systemd_service "tile-ratelimit" do
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"
   nice 10
-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "strict"
-  protect_home true
+  sandbox true
   read_write_paths "/srv/tile.openstreetmap.org/conf"
-  no_new_privileges true
   restart "on-failure"
 end
 
@@ -595,17 +594,12 @@ systemd_service "expire-tiles" do
   exec_start "/usr/local/bin/expire-tiles"
   nice 10
   standard_output "null"
-  private_tmp true
-  private_devices true
-  protect_system "strict"
-  protect_home true
-  read_write_paths [
+  sandbox true
+  read_write_paths tile_directories + [
     "/store/database/nodes",
-    "/store/tiles/%i",
     "/var/lib/replicate/expire-queue",
     "/var/log/tile"
   ]
-  no_new_privileges true
 end
 
 systemd_path "expire-tiles" do
@@ -624,16 +618,13 @@ systemd_service "replicate" do
   wants "postgresql.service"
   user "tile"
   exec_start "/usr/local/bin/replicate"
-  private_tmp true
-  private_devices true
-  protect_system "strict"
-  protect_home true
+  sandbox :enable_network => true
+  restrict_address_families "AF_UNIX"
   read_write_paths [
     "/store/database/nodes",
     "/var/lib/replicate",
     "/var/log/tile"
   ]
-  no_new_privileges true
   restart "on-failure"
 end
 
@@ -662,13 +653,9 @@ systemd_service "render-lowzoom" do
   condition_path_exists_glob "!/run/update-lowzoom-*"
   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "strict"
-  protect_home true
+  sandbox true
+  restrict_address_families "AF_UNIX"
   read_write_paths "/var/log/tile"
-  no_new_privileges true
 end
 
 systemd_timer "render-lowzoom" do
@@ -690,18 +677,27 @@ template "/usr/local/bin/cleanup-tiles" do
   mode "755"
 end
 
-tile_directories = node[:tile][:styles].collect do |_, style|
-  style[:tile_directories].collect { |directory| directory[:name] }
-end.flatten.sort.uniq
+systemd_service "cleanup-tiles@" do
+  description "Cleanup old tiles for /%I"
+  exec_start "/usr/local/bin/cleanup-tiles /%I"
+  user "_renderd"
+  io_scheduling_class "idle"
+  sandbox true
+  read_write_paths "/%I"
+end
+
+systemd_timer "cleanup-tiles@" do
+  description "Cleanup old tiles for /%I"
+  on_boot_sec "30m"
+  on_unit_inactive_sec "60m"
+  randomized_delay_sec "10m"
+end
 
 tile_directories.each do |directory|
-  label = directory.gsub("/", "-")
+  label = directory[1..].gsub("/", "-")
 
-  cron_d "cleanup-tiles#{label}" do
-    minute "0"
-    user "_renderd"
-    command "ionice -c 3 /usr/local/bin/cleanup-tiles #{directory}"
-    mailto "admins@openstreetmap.org"
+  service "cleanup-tiles@#{label}.timer" do
+    action [:enable, :start]
   end
 end