blog: Enable staging blog

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 449f38ffb83e3fd3093b7f29fe798d1e2199089b..2ebcbf041376ac00102ff9fc43b4bb7cd1884477 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: tile
+# Cookbook:: tile

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,14 +17,18 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "prometheus"

 include_recipe "python"
 include_recipe "python"

+include_recipe "ruby"

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

+admins = data_bag_item("apache", "admins")

 web_passwords = data_bag_item("web", "passwords")
 
 apache_module "alias"
 web_passwords = data_bag_item("web", "passwords")
 
 apache_module "alias"


@@ -38,51 +42,80 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
   conf "tile.conf.erb"
 end
 

+apache_conf "renderd" do
+  action :disable
+end
+

 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 end
 
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 end
 

-tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
+remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
+  source "https://api.fastly.com/public-ip-list"
+  compile_time true
+  ignore_failure true
+end
+
+fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
+
+remote_file "#{Chef::Config[:file_cache_path]}/statuscake-locations.json" do
+  source "https://app.statuscake.com/Workfloor/Locations.php?format=json"
+  compile_time true
+  ignore_failure true
+end
+
+statuscakelocations = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/statuscake-locations.json"))

 
 apache_site "default" do
 
 apache_site "default" do

-  action [:disable]
+  action :disable
+end
+
+apache_site "tileserver_site" do
+  action :disable

 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"
 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"

-  variables :caches => tilecaches
+  variables :fastly => fastlyips["addresses"] + fastlyips["ipv6_addresses"],
+            :statuscake => statuscakelocations.flat_map { |_, v| [v["ip"], v["ipv6"]] },
+            :admins => admins["hosts"]

 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 end
 

-package "renderd"
+tile_directories = node[:tile][:styles].collect do |_, style|
+  style[:tile_directories].collect { |directory| directory[:name] }
+end.flatten.sort.uniq
+
+package %w[
+  renderd
+  libgoogle-perftools4
+]

 
 systemd_service "renderd" do
 
 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"
-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  environment "LD_PRELOAD" => "libtcmalloc.so.4"
+  limit_nofile 4096
+  memory_high "80%"
+  memory_max "90%"
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths tile_directories
+  system_call_filter ["@system-service", "mincore"]

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


@@ -94,14 +127,14 @@ end
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end


@@ -110,56 +143,38 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
   source "html"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

   files_owner "tile"
   files_group "tile"
   files_owner "tile"
   files_group "tile"

-  files_mode 0o644
+  files_mode "644"

 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"

-  mode 0o644
+  mode "644"

 end
 
 package %w[
 end
 
 package %w[

-  python-cairo
-  python-mapnik
-  python-setuptools
-]
-
-python_package "pyotp"
-
-package %w[
-  fonts-noto-cjk
-  fonts-noto-hinted
-  fonts-noto-unhinted
-  fonts-hanazono
-  ttf-unifont
+  python3-cairo
+  python3-mapnik
+  python3-pyotp
+  python3-pyproj
+  python3-setuptools

 ]
 
 ]
 

-["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 0o644
-  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"

-  mode 0o755
+  mode "755"

 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

   variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 
   variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 


@@ -167,23 +182,38 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
   source "debug.erb"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 end
 

-template "/etc/cron.hourly/export" do
-  source "export.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+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
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 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]


@@ -195,15 +225,13 @@ node[:tile][:data].each_value do |data|
     directory directory do
       owner "tile"
       group "tile"
     directory directory do
       owner "tile"
       group "tile"

-      mode 0o755
+      mode "755"

     end
   else
     directory = "/srv/tile.openstreetmap.org/data"
   end
 
   if file =~ /\.tgz$/
     end
   else
     directory = "/srv/tile.openstreetmap.org/data"
   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}"


@@ -211,8 +239,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}"


@@ -220,8 +246,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}"


@@ -250,7 +274,7 @@ node[:tile][:data].each_value do |data|
     source url
     owner "tile"
     group "tile"
     source url
     owner "tile"
     group "tile"

-    mode 0o644
+    mode "644"

     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"


@@ -258,25 +282,28 @@ node[:tile][:data].each_value do |data|
 end
 
 nodejs_package "carto"
 end
 
 nodejs_package "carto"

-nodejs_package "millstone"
+
+lowzoom_threads = node.cpu_cores - 1

 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"

+  exec_start_pre "+/bin/systemctl stop render-lowzoom.service"

   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"

-  private_tmp true
-  private_devices true
-  private_network true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  runtime_directory "update-lowzoom-%i"
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths [
+    "/srv/tile.openstreetmap.org/tiles/%i",
+    "/var/log/tile"
+  ]

   restart "on-failure"
 end
 
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
   restart "on-failure"
 end
 
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 node[:tile][:styles].each do |name, details|
 end
 
 node[:tile][:styles].each do |name, details|


@@ -287,8 +314,8 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
     source "update-lowzoom.erb"
     owner "root"
     group "root"

-    mode 0o755
-    variables :style => name
+    mode "755"
+    variables :style => name, :threads => lowzoom_threads

   end
 
   service "update-lowzoom@#{name}" do
   end
 
   service "update-lowzoom@#{name}" do


@@ -299,21 +326,21 @@ node[:tile][:styles].each do |name, details|
   directory tile_directory do
     owner "tile"
     group "tile"
   directory tile_directory do
     owner "tile"
     group "tile"

-    mode 0o755
+    mode "755"

   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do

-      owner "www-data"
-      group "www-data"
-      mode 0o755
+      owner "_renderd"
+      group "_renderd"
+      mode "755"

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

-        owner "www-data"
-        group "www-data"
-        mode 0o755
+        owner "_renderd"
+        group "_renderd"
+        mode "755"

       end
 
       link "#{tile_directory}/#{zoom}" do
       end
 
       link "#{tile_directory}/#{zoom}" do


@@ -328,7 +355,7 @@ node[:tile][:styles].each do |name, details|
     action :create_if_missing
     owner "tile"
     group "tile"
     action :create_if_missing
     owner "tile"
     group "tile"

-    mode 0o444
+    mode "444"

   end
 
   git style_directory do
   end
 
   git style_directory do


@@ -345,9 +372,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"


@@ -358,9 +396,9 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first

+postgis_version = node[:tile][:database][:postgis]

 
 

-package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"

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


@@ -372,6 +410,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


@@ -380,6 +423,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"


@@ -393,9 +440,10 @@ end
 postgresql_extension "hstore" do
   cluster node[:tile][:database][:cluster]
   database "gis"
 postgresql_extension "hstore" do
   cluster node[:tile][:database][:cluster]
   database "gis"

+  only_if { node[:tile][:database][:hstore] }

 end
 
 end
 

-%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table|
+%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table|

   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -404,104 +452,109 @@ end
   end
 end
 
   end
 end
 

-%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads].each do |table|
+%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads spatial_ref_sys].each do |table|

   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"
   postgresql_table table do
     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
 

-postgresql_munin "gis" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
+package %w[
+  gdal-bin
+  python3-yaml
+  python3-psycopg2
+]
+
+if node[:tile][:database][:external_data_script]
+  execute node[:tile][:database][:external_data_script] do
+    command "#{node[:tile][:database][:external_data_script]} -R _renderd"
+    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
 

-file node[:tile][:node_file] do
+directory File.dirname(node[:tile][:database][:node_file]) do
+  owner "root"
+  group "root"
+  mode "755"
+  recursive true
+end
+
+file node[:tile][:database][:node_file] do

   owner "tile"
   owner "tile"

-  group "www-data"
-  mode 0o640
+  group "_renderd"
+  mode "660"

 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 package %w[
   osm2pgsql
 end
 
 package %w[
   osm2pgsql

-  osmosis
-]
-
-package %w[
-  ruby
-  ruby-dev
-]
-
-package %w[
-  libproj-dev
-  libxml2-dev
+  osmium-tool
+  pyosmium

 ]
 
 ]
 

-gem_package "proj4rb"
-gem_package "libxml-ruby"
+directory node[:tile][:replication][:directory] do
+  owner "tile"
+  group "tile"
+  mode "755"
+end

 
 

-remote_directory "/usr/local/lib/site_ruby" do
-  source "ruby"
-  owner "root"
-  group "root"
-  mode 0o755
-  files_owner "root"
-  files_group "root"
-  files_mode 0o644
+link "/var/lib/replicate" do
+  to node[:tile][:replication][:directory]
+  owner "tile"
+  group "tile"
+  not_if { node[:tile][:replication][:directory] == "/var/lib/replicate" }

 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"

-  mode 0o755
-end
-
-directory "/var/lib/replicate" do
-  owner "tile"
-  group "tile"
-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
 end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"

-  group "www-data"
-  mode 0o775
-end
-
-template "/var/lib/replicate/configuration.txt" do
-  source "replicate.configuration.erb"
-  owner "tile"
-  group "tile"
-  mode 0o644
+  group "_renderd"
+  mode "775"

 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"
 end
 
 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"

-  standard_output "null"
-  private_tmp true
-  private_devices true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  nice 10
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths tile_directories + [
+                     "/var/lib/replicate/expire-queue"
+                   ]

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


@@ -514,17 +567,25 @@ service "expire-tiles.path" do
   subscribes :restart, "systemd_path[expire-tiles]"
 end
 
   subscribes :restart, "systemd_path[expire-tiles]"
 end
 

+template "/usr/local/bin/replicate-post" do
+  source "replicate-post.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end
+

 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
   wants "postgresql.service"
   user "tile"
   exec_start "/usr/local/bin/replicate"
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
   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"
+  ]

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


@@ -534,25 +595,31 @@ service "replicate" do
   subscribes :restart, "systemd_service[replicate]"
 end
 
   subscribes :restart, "systemd_service[replicate]"
 end
 

-template "/etc/logrotate.d/replicate" do
-  source "replicate.logrotate.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-

 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"
+  variables :threads => lowzoom_threads

 end
 
 end
 

-template "/etc/cron.d/render-lowzoom" do
-  source "render-lowzoom.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+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"
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths "/var/log/tile"
+end
+
+systemd_timer "render-lowzoom" do
+  description "Render low zoom tiles"
+  on_calendar "23:00 #{node[:timezone]}"
+end
+
+service "render-lowzoom.timer" do
+  action [:enable, :start]

 end
 
 package "liblockfile-simple-perl"
 end
 
 package "liblockfile-simple-perl"


@@ -562,32 +629,39 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
   source "cleanup-tiles.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 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

 
 

-template "/etc/cron.d/cleanup-tiles" do
-  source "cleanup-tiles.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  variables :directories => tile_directories
+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
 
 end
 

-munin_plugin "mod_tile_fresh"
-munin_plugin "mod_tile_latency"
-munin_plugin "mod_tile_response"
-munin_plugin "mod_tile_zoom"
+tile_directories.each do |directory|
+  label = directory[1..].gsub("/", "-")

 
 

-munin_plugin "renderd_processed"
-munin_plugin "renderd_queue"
-munin_plugin "renderd_queue_time"
-munin_plugin "renderd_zoom"
-munin_plugin "renderd_zoom_time"
+  service "cleanup-tiles@#{label}.timer" do
+    action [:enable, :start]
+  end
+end
+
+package "ruby-webrick"
+
+prometheus_exporter "modtile" do
+  port 9494
+end

 
 

-munin_plugin "replication_delay" do
-  conf "munin.erb"
+prometheus_exporter "renderd" do
+  port 9393

 end
 end