Use default sandboxing for tilelog service

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index d726a2220cb6783ca1179403a7f455fd9aab5447..b62c89d1dccaa655ddf4725f3b773bf831e05f6e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -199,7 +199,11 @@ directory "/srv/tile.openstreetmap.org/data" do
   mode "755"
 end
 
   mode "755"
 end
 

-package "mapnik-utils"
+package %w[
+  mapnik-utils
+  tar
+  unzip
+]

 
 node[:tile][:data].each_value do |data|
   url = data[:url]
 
 node[:tile][:data].each_value do |data|
   url = data[:url]


@@ -218,8 +222,6 @@ node[:tile][:data].each_value do |data|
   end
 
   if file =~ /\.tgz$/
   end
 
   if file =~ /\.tgz$/

-    package "tar"
-

     execute file do
       action :nothing
       command "tar -zxf #{file} -C #{directory}"
     execute file do
       action :nothing
       command "tar -zxf #{file} -C #{directory}"


@@ -227,8 +229,6 @@ node[:tile][:data].each_value do |data|
       group "tile"
     end
   elsif file =~ /\.tar\.bz2$/
       group "tile"
     end
   elsif file =~ /\.tar\.bz2$/

-    package "tar"
-

     execute file do
       action :nothing
       command "tar -jxf #{file} -C #{directory}"
     execute file do
       action :nothing
       command "tar -jxf #{file} -C #{directory}"


@@ -236,8 +236,6 @@ node[:tile][:data].each_value do |data|
       group "tile"
     end
   elsif file =~ /\.zip$/
       group "tile"
     end
   elsif file =~ /\.zip$/

-    package "unzip"
-

     execute file do
       action :nothing
       command "unzip -qq -o #{file} -d #{directory}"
     execute file do
       action :nothing
       command "unzip -qq -o #{file} -d #{directory}"


@@ -277,15 +275,19 @@ 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"
   private_tmp true
   private_devices true
   private_network true
   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 "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths [
+    "/srv/tile.openstreetmap.org/tiles/%i",
+    "/var/log/tile"
+  ]

   no_new_privileges true
   restart "on-failure"
 end
   no_new_privileges true
   restart "on-failure"
 end


@@ -375,7 +377,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"


@@ -546,7 +548,7 @@ systemd_service "tile-ratelimit" do
   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   read_write_paths "/srv/tile.openstreetmap.org/conf"
   no_new_privileges true
   protect_home true
   read_write_paths "/srv/tile.openstreetmap.org/conf"
   no_new_privileges true


@@ -595,8 +597,14 @@ systemd_service "expire-tiles" do
   standard_output "null"
   private_tmp true
   private_devices true
   standard_output "null"
   private_tmp true
   private_devices true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

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

   no_new_privileges true
 end
 
   no_new_privileges true
 end
 


@@ -618,8 +626,13 @@ systemd_service "replicate" do
   exec_start "/usr/local/bin/replicate"
   private_tmp true
   private_devices true
   exec_start "/usr/local/bin/replicate"
   private_tmp true
   private_devices true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths [
+    "/store/database/nodes",
+    "/var/lib/replicate",
+    "/var/log/tile"
+  ]

   no_new_privileges true
   restart "on-failure"
 end
   no_new_privileges true
   restart "on-failure"
 end


@@ -652,8 +665,9 @@ systemd_service "render-lowzoom" do
   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true

-  protect_system "full"
+  protect_system "strict"

   protect_home true
   protect_home true

+  read_write_paths "/var/log/tile"

   no_new_privileges true
 end
 
   no_new_privileges true
 end