Tweak some tile sandboxes

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index fe5934a61f9672c8b45a18cb9831fc29a4e67be5..963c3dd2f5b075e4485f4d453a354c264bbff3e6 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -104,12 +104,9 @@ systemd_service "renderd" do
   after "postgresql.service"
   wants "postgresql.service"
   limit_nofile 4096
   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 "/store/tiles"

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -275,20 +272,16 @@ nodejs_package "carto"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"

-  conflicts "render-lowzoom.service"

   user "tile"
   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"
   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"
   ]
   read_write_paths [
     "/srv/tile.openstreetmap.org/tiles/%i",
     "/var/log/tile"
   ]

-  no_new_privileges true

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -377,7 +370,7 @@ node[:tile][:styles].each do |name, details|
 
   execute "#{style_directory}/project.mml" do
     action :nothing
 
   execute "#{style_directory}/project.mml" do
     action :nothing

-    command "carto -a 3.0.0 project.mml > project.xml"
+    command "carto -a 3.0.22 project.mml > project.xml"

     cwd style_directory
     user "tile"
     group "tile"
     cwd style_directory
     user "tile"
     group "tile"


@@ -545,13 +538,8 @@ systemd_service "tile-ratelimit" do
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"
   nice 10
   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"
   read_write_paths "/srv/tile.openstreetmap.org/conf"

-  no_new_privileges true

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -595,17 +583,13 @@ systemd_service "expire-tiles" do
   exec_start "/usr/local/bin/expire-tiles"
   nice 10
   standard_output "null"
   exec_start "/usr/local/bin/expire-tiles"
   nice 10
   standard_output "null"

-  private_tmp true
-  private_devices true
-  protect_system "strict"
-  protect_home true
+  sandbox true

   read_write_paths [
     "/store/database/nodes",
     "/store/tiles/%i",
     "/var/lib/replicate/expire-queue",
     "/var/log/tile"
   ]
   read_write_paths [
     "/store/database/nodes",
     "/store/tiles/%i",
     "/var/lib/replicate/expire-queue",
     "/var/log/tile"
   ]

-  no_new_privileges true

 end
 
 systemd_path "expire-tiles" do
 end
 
 systemd_path "expire-tiles" do


@@ -624,16 +608,13 @@ systemd_service "replicate" do
   wants "postgresql.service"
   user "tile"
   exec_start "/usr/local/bin/replicate"
   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"
   ]
   read_write_paths [
     "/store/database/nodes",
     "/var/lib/replicate",
     "/var/log/tile"
   ]

-  no_new_privileges true

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -662,13 +643,9 @@ systemd_service "render-lowzoom" do
   condition_path_exists_glob "!/run/update-lowzoom-*"
   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   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"
   read_write_paths "/var/log/tile"

-  no_new_privileges true

 end
 
 systemd_timer "render-lowzoom" do
 end
 
 systemd_timer "render-lowzoom" do