tile: Fix Mac ARM compatibility (kitchen)

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 1bc45e92f92082b6629ace57305104967120bb01..a9b503c1c6bd3ad1240207356246045a8f5e5882 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -25,6 +25,7 @@ include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"
 include_recipe "python"
 include_recipe "postgresql"
 include_recipe "prometheus"
 include_recipe "python"

+include_recipe "ruby"

 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")


@@ -96,26 +97,27 @@ file "/srv/tile.openstreetmap.org/conf/ip.map" do
   mode "644"
 end
 
   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
 package "renderd"
 
 systemd_service "renderd" do

-  description "Mapnik rendering daemon"
+  dropin "chef"

   after "postgresql.service"
   wants "postgresql.service"
   after "postgresql.service"
   wants "postgresql.service"

-  user "www-data"
-  exec_start "/usr/bin/renderd -f"
-  runtime_directory "renderd"
-  standard_error "null"

   limit_nofile 4096
   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
 
   restart "on-failure"
 end
 

+systemd_service "renderd" do
+  action :delete
+end
+

 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"
 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"


@@ -156,6 +158,7 @@ end
 package %w[
   python3-cairo
   python3-mapnik
 package %w[
   python3-cairo
   python3-mapnik

+  python3-pyproj

   python3-setuptools
 ]
 
   python3-setuptools
 ]
 


@@ -163,24 +166,6 @@ python_package "pyotp" do
   python_version "3"
 end
 
   python_version "3"
 end
 

-package %w[
-  fonts-noto-cjk
-  fonts-noto-hinted
-  fonts-noto-unhinted
-  fonts-hanazono
-  ttf-unifont
-]
-
-["NotoSansArabicUI-Regular.ttf", "NotoSansArabicUI-Bold.ttf"].each do |font|
-  remote_file "/usr/share/fonts/truetype/noto/#{font}" do
-    action :create_if_missing
-    source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
-    owner "root"
-    group "root"
-    mode "644"
-  end
-end
-

 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"


@@ -215,7 +200,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]


@@ -234,8 +223,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}"


@@ -243,8 +230,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}"


@@ -252,8 +237,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}"


@@ -293,16 +276,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 "full"
-  protect_home true
-  no_new_privileges true
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths [
+    "/srv/tile.openstreetmap.org/tiles/%i",
+    "/var/log/tile"
+  ]

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


@@ -337,15 +320,15 @@ node[:tile][:styles].each do |name, details|
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do

-      owner "www-data"
-      group "www-data"
+      owner "_renderd"
+      group "_renderd"

       mode "755"
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
       mode "755"
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do

-        owner "www-data"
-        group "www-data"
+        owner "_renderd"
+        group "_renderd"

         mode "755"
       end
 
         mode "755"
       end
 


@@ -378,9 +361,20 @@ node[:tile][:styles].each do |name, details|
     group "tile"
   end
 
     group "tile"
   end
 

+  if details[:fonts_script]
+    execute details[:fonts_script] do
+      action :nothing
+      command details[:fonts_script]
+      cwd style_directory
+      user "tile"
+      group "tile"
+      subscribes :run, "git[#{style_directory}]"
+    end
+  end
+

   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"


@@ -405,6 +399,11 @@ postgresql_user "tomh" do
   superuser true
 end
 
   superuser true
 end
 

+postgresql_user "pnorman" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+

 postgresql_user "tile" do
   cluster node[:tile][:database][:cluster]
 end
 postgresql_user "tile" do
   cluster node[:tile][:database][:cluster]
 end


@@ -413,6 +412,10 @@ postgresql_user "www-data" do
   cluster node[:tile][:database][:cluster]
 end
 
   cluster node[:tile][:database][:cluster]
 end
 

+postgresql_user "_renderd" do
+  cluster node[:tile][:database][:cluster]
+end
+

 postgresql_database "gis" do
   cluster node[:tile][:database][:cluster]
   owner "tile"
 postgresql_database "gis" do
   cluster node[:tile][:database][:cluster]
   owner "tile"


@@ -443,7 +446,7 @@ end
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"

-    permissions "tile" => :all, "www-data" => :select
+    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select

   end
 end
 
   end
 end
 


@@ -455,10 +458,20 @@ package %w[
 
 if node[:tile][:database][:external_data_script]
   execute node[:tile][:database][:external_data_script] do
 
 if node[:tile][:database][:external_data_script]
   execute node[:tile][:database][:external_data_script] do

-    command "#{node[:tile][:database][:external_data_script]} -R www-data"
+    command "#{node[:tile][:database][:external_data_script]} -R _renderd"

     cwd "/srv/tile.openstreetmap.org"
     user "tile"
     group "tile"
     cwd "/srv/tile.openstreetmap.org"
     user "tile"
     group "tile"

+    ignore_failure true
+  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, "_renderd" => :select
+    end

   end
 end
 
   end
 end
 


@@ -476,7 +489,7 @@ end
 
 file node[:tile][:database][:node_file] do
   owner "tile"
 
 file node[:tile][:database][:node_file] do
   owner "tile"

-  group "www-data"
+  group "_renderd"

   mode "660"
 end
 
   mode "660"
 end
 


@@ -488,15 +501,22 @@ end
 
 package %w[
   osm2pgsql
 
 package %w[
   osm2pgsql

-  ruby

   osmium-tool
   pyosmium
   python3-pyproj
 ]
 
   osmium-tool
   pyosmium
   python3-pyproj
 ]
 

-gem_package "apachelogregex"
-gem_package "file-tail"
-gem_package "lru_redux"
+gem_package "apachelogregex" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "file-tail" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "lru_redux" do
+  gem_binary node[:ruby][:gem]
+end

 
 remote_directory "/usr/local/bin" do
   source "bin"
 
 remote_directory "/usr/local/bin" do
   source "bin"


@@ -521,19 +541,15 @@ systemd_service "tile-ratelimit" do
   user "tile"
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"
   user "tile"
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"

-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "full"
-  protect_home true
+  nice 10
+  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
 
 service "tile-ratelimit" do
   action [:enable, :start]
   restart "on-failure"
 end
 
 service "tile-ratelimit" do
   action [:enable, :start]

-  subscribes :restart, "file[/usr/local/bin/time-ratelimit]"
+  subscribes :restart, "file[/usr/local/bin/tile-ratelimit]"

   subscribes :restart, "systemd_service[tile-ratelimit]"
 end
 
   subscribes :restart, "systemd_service[tile-ratelimit]"
 end
 


@@ -552,7 +568,7 @@ end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"

-  group "www-data"
+  group "_renderd"

   mode "775"
 end
 
   mode "775"
 end
 


@@ -567,14 +583,16 @@ end
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"

-  user "www-data"
+  user "_renderd"

   exec_start "/usr/local/bin/expire-tiles"
   exec_start "/usr/local/bin/expire-tiles"

+  nice 10

   standard_output "null"
   standard_output "null"

-  private_tmp true
-  private_devices true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  sandbox true
+  read_write_paths tile_directories + [
+    "/store/database/nodes",
+    "/var/lib/replicate/expire-queue",
+    "/var/log/tile"
+  ]

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


@@ -593,11 +611,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 "full"
-  protect_home true
-  no_new_privileges true
+  sandbox :enable_network => true
+  restrict_address_families "AF_UNIX"
+  read_write_paths [
+    "/store/database/nodes",
+    "/var/lib/replicate",
+    "/var/log/tile"
+  ]

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


@@ -626,17 +646,14 @@ 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 "full"
-  protect_home true
-  no_new_privileges true
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths "/var/log/tile"

 end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"
 end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"

-  on_calendar "Sun *-*~07/1 01:00:00"
+  on_calendar "Fri *-*-* 23:00:00 UTC"

 end
 
 service "render-lowzoom.timer" do
 end
 
 service "render-lowzoom.timer" do


@@ -653,18 +670,27 @@ template "/usr/local/bin/cleanup-tiles" do
   mode "755"
 end
 
   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|
 
 tile_directories.each do |directory|

-  label = directory.gsub("/", "-")
+  label = directory[1..].gsub("/", "-")

 
 

-  cron_d "cleanup-tiles#{label}" do
-    minute "0"
-    user "www-data"
-    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
 
   end
 end
 


@@ -681,6 +707,8 @@ munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 
 
 munin_plugin "replication_delay"
 

+package "ruby-webrick"
+

 prometheus_exporter "modtile" do
   port 9494
 end
 prometheus_exporter "modtile" do
   port 9494
 end