X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e051122790c1ad8fda6cff83bd3ecb84380ef738..344788757d5720c1910a441e7d2b33aa57fb2dbe:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 89212c2ee..f642aafb8 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: tile +# Cookbook:: tile # 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 # -# 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, @@ -17,15 +17,23 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" include_recipe "git" +include_recipe "munin" include_recipe "nodejs" include_recipe "postgresql" +include_recipe "prometheus" +include_recipe "python" +include_recipe "ruby" 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" +apache_module "cgi" apache_module "expires" apache_module "headers" apache_module "remoteip" @@ -35,48 +43,92 @@ apache_module "tile" do conf "tile.conf.erb" end -tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] } +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 + +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 - action [:disable] + action :disable +end + +apache_site "tileserver_site" do + action :disable 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" - mode 0644 + mode "644" end directory "/srv/tile.openstreetmap.org" do owner "tile" group "tile" - mode 0755 + mode "755" 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 + dropin "chef" + after "postgresql.service" + wants "postgresql.service" + limit_nofile 4096 + sandbox true + restrict_address_families "AF_UNIX" + read_write_paths tile_directories + restart "on-failure" +end + service "renderd" do action [:enable, :start] - supports :status => false, :restart => true, :reload => false + subscribes :restart, "systemd_service[renderd]" end directory "/srv/tile.openstreetmap.org/tiles" do owner "tile" group "tile" - mode 0755 + mode "755" end template "/etc/renderd.conf" do source "renderd.conf.erb" owner "root" group "root" - mode 0644 + mode "644" notifies :reload, "service[apache2]" notifies :restart, "service[renderd]" end @@ -85,82 +137,98 @@ remote_directory "/srv/tile.openstreetmap.org/html" do source "html" owner "tile" group "tile" - mode 0755 + mode "755" files_owner "tile" files_group "tile" - files_mode 0644 + files_mode "644" end template "/srv/tile.openstreetmap.org/html/index.html" do source "index.html.erb" owner "tile" group "tile" - mode 0644 + mode "644" end -package "python-cairo" -package "python-mapnik" +package %w[ + python3-cairo + python3-mapnik + python3-pyproj + python3-setuptools +] -package "ttf-dejavu" -package "fonts-droid" -package "ttf-unifont" -package "fonts-sipa-arundina" -package "fonts-sil-padauk" -package "fonts-khmeros" -package "ttf-indic-fonts-core" -package "ttf-tamil-fonts" -package "ttf-kannada-fonts" +python_package "pyotp" do + python_version "3" +end directory "/srv/tile.openstreetmap.org/cgi-bin" do owner "tile" group "tile" - mode 0755 + mode "755" end template "/srv/tile.openstreetmap.org/cgi-bin/export" do source "export.erb" owner "tile" group "tile" - mode 0755 - variables :blocks => blocks + mode "755" + variables :blocks => blocks, :totp_key => web_passwords["totp_key"] end template "/srv/tile.openstreetmap.org/cgi-bin/debug" do source "debug.erb" owner "tile" group "tile" - mode 0755 + mode "755" end -template "/etc/cron.hourly/export" do - source "export.cron.erb" - owner "root" - group "root" - mode 0755 +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" - mode 0755 + mode "755" end -package "mapnik-utils" +package %w[ + mapnik-utils + tar + unzip +] node[:tile][:data].each_value do |data| url = data[:url] file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}" - directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}" - directory directory do - owner "tile" - group "tile" - mode 0755 + if data[:directory] + directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}" + + directory directory do + owner "tile" + group "tile" + mode "755" + 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}" @@ -168,8 +236,6 @@ node[:tile][:data].each_value do |data| group "tile" end elsif file =~ /\.tar\.bz2$/ - package "tar" - execute file do action :nothing command "tar -jxf #{file} -C #{directory}" @@ -177,8 +243,6 @@ node[:tile][:data].each_value do |data| group "tile" end elsif file =~ /\.zip$/ - package "unzip" - execute file do action :nothing command "unzip -qq -o #{file} -d #{directory}" @@ -187,21 +251,6 @@ node[:tile][:data].each_value do |data| end end - if data[:processed] - original = "#{directory}/#{data[:original]}" - processed = "#{directory}/#{data[:processed]}" - - package "gdal-bin" - - execute processed do - action :nothing - command "ogr2ogr #{processed} #{original}" - user "tile" - group "tile" - subscribes :run, "execute[#{file}]", :immediately - end - end - execute "#{file}_shapeindex" do action :nothing command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files" @@ -214,6 +263,7 @@ node[:tile][:data].each_value do |data| if data[:refresh] action :create use_conditional_get true + ignore_failure true else action :create_if_missing end @@ -221,7 +271,7 @@ node[:tile][:data].each_value do |data| source url owner "tile" group "tile" - mode 0644 + mode "644" backup false notifies :run, "execute[#{file}]", :immediately notifies :restart, "service[renderd]" @@ -229,12 +279,26 @@ node[:tile][:data].each_value do |data| end nodejs_package "carto" -nodejs_package "millstone" + +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" + 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" - mode 0755 + mode "755" end node[:tile][:styles].each do |name, details| @@ -245,19 +309,11 @@ node[:tile][:styles].each do |name, details| source "update-lowzoom.erb" owner "root" group "root" - mode 0755 + mode "755" variables :style => name end - template "/etc/init.d/update-lowzoom-#{name}" do - source "update-lowzoom.init.erb" - owner "root" - group "root" - mode 0755 - variables :style => name - end - - service "update-lowzoom-#{name}" do + service "update-lowzoom@#{name}" do action :disable supports :restart => true end @@ -265,21 +321,21 @@ node[:tile][:styles].each do |name, details| directory tile_directory do owner "tile" group "tile" - mode 0755 + mode "755" end details[:tile_directories].each do |directory| directory directory[:name] do - owner "www-data" - group "www-data" - mode 0755 + owner "_renderd" + group "_renderd" + mode "755" end directory[:min_zoom].upto(directory[:max_zoom]) do |zoom| directory "#{directory[:name]}/#{zoom}" do - owner "www-data" - group "www-data" - mode 0755 + owner "_renderd" + group "_renderd" + mode "755" end link "#{tile_directory}/#{zoom}" do @@ -294,7 +350,7 @@ node[:tile][:styles].each do |name, details| action :create_if_missing owner "tile" group "tile" - mode 0444 + mode "444" end git style_directory do @@ -311,19 +367,33 @@ node[:tile][:styles].each do |name, details| 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 - command "carto project.mml > project.xml" + command "carto -a 3.0.22 project.mml > project.xml" cwd style_directory user "tile" group "tile" subscribes :run, "git[#{style_directory}]" notifies :restart, "service[renderd]", :immediately - notifies :restart, "service[update-lowzoom-#{name}]" + notifies :restart, "service[update-lowzoom@#{name}]" end end -package "postgis" +postgresql_version = node[:tile][:database][:cluster].split("/").first +postgis_version = node[:tile][:database][:postgis] + +package "postgresql-#{postgresql_version}-postgis-#{postgis_version}" postgresql_user "jburgess" do cluster node[:tile][:database][:cluster] @@ -335,6 +405,11 @@ postgresql_user "tomh" do 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 @@ -343,6 +418,10 @@ postgresql_user "www-data" do 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" @@ -353,7 +432,13 @@ postgresql_extension "postgis" do database "gis" end -%w(geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys).each do |table| +postgresql_extension "hstore" do + cluster node[:tile][:database][:cluster] + database "gis" + only_if { node[:tile][:database][:hstore] } +end + +%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" @@ -362,12 +447,37 @@ 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" - permissions "tile" => :all, "www-data" => :select + permissions "tile" => :all, "www-data" => :select, "_renderd" => :select + end +end + +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 @@ -376,126 +486,140 @@ postgresql_munin "gis" do database "gis" 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" - group "www-data" - mode 0640 + group "_renderd" + mode "660" end directory "/var/log/tile" do owner "tile" group "tile" - mode 0755 -end - -package "osm2pgsql" -package "osmosis" - -package "ruby" - -if node[:lsb][:release].to_f < 14.04 - package "rubygems" + mode "755" end -package "libproj-dev" -package "libxml2-dev" +package %w[ + osm2pgsql + osmium-tool + pyosmium + python3-pyproj +] -gem_package "proj4rb" -gem_package "libxml-ruby" -gem_package "mmap" - -remote_directory "/usr/local/lib/site_ruby" do - source "ruby" +remote_directory "/usr/local/bin" do + source "bin" owner "root" group "root" - mode 0755 + mode "755" files_owner "root" files_group "root" - files_mode 0644 + files_mode "755" end template "/usr/local/bin/expire-tiles" do source "expire-tiles.erb" owner "root" group "root" - mode 0755 -end - -template "/etc/sudoers.d/tile" do - source "sudoers.erb" - owner "root" - group "root" - mode 0440 + mode "755" end directory "/var/lib/replicate" do owner "tile" group "tile" - mode 0755 + mode "755" end -template "/var/lib/replicate/configuration.txt" do - source "replicate.configuration.erb" +directory "/var/lib/replicate/expire-queue" do owner "tile" - group "tile" - mode 0644 + group "_renderd" + mode "775" end template "/usr/local/bin/replicate" do source "replicate.erb" owner "root" group "root" - mode 0755 + mode "755" + variables :postgresql_version => postgresql_version.to_f end -template "/etc/init.d/replicate" do - source "replicate.init.erb" - owner "root" - group "root" - mode 0755 +systemd_service "expire-tiles" do + description "Tile dirtying service" + type "simple" + user "_renderd" + exec_start "/usr/local/bin/expire-tiles" + nice 10 + standard_output "null" + sandbox true + read_write_paths tile_directories + [ + "/store/database/nodes", + "/var/lib/replicate/expire-queue", + "/var/log/tile" + ] end -service "replicate" do +systemd_path "expire-tiles" do + description "Tile dirtying trigger" + directory_not_empty "/var/lib/replicate/expire-queue" +end + +service "expire-tiles.path" do action [:enable, :start] - supports :restart => true - subscribes :restart, "template[/usr/local/bin/replicate]" - subscribes :restart, "template[/etc/init.d/replicate]" + subscribes :restart, "systemd_path[expire-tiles]" end -template "/etc/logrotate.d/replicate" do - source "replicate.logrotate.erb" - owner "root" - group "root" - mode 0644 +systemd_service "replicate" do + description "Rendering database replication service" + after "postgresql.service" + wants "postgresql.service" + user "tile" + exec_start "/usr/local/bin/replicate" + 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 + +service "replicate" do + action [:enable, :start] + subscribes :restart, "template[/usr/local/bin/replicate]" + subscribes :restart, "systemd_service[replicate]" end template "/usr/local/bin/render-lowzoom" do source "render-lowzoom.erb" owner "root" group "root" - mode 0755 + mode "755" end -template "/etc/cron.d/render-lowzoom" do - source "render-lowzoom.cron.erb" - owner "root" - group "root" - mode 0644 +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 -template "/etc/rsyslog.d/20-renderd.conf" do - source "renderd.rsyslog.erb" - owner "root" - group "root" - mode 0644 - notifies :restart, "service[rsyslog]" +systemd_timer "render-lowzoom" do + description "Render low zoom tiles" + on_calendar "Fri *-*-* 23:00:00 UTC" end -template "/etc/logrotate.d/renderd" do - source "renderd.logrotate.erb" - owner "root" - group "root" - mode 0644 +service "render-lowzoom.timer" do + action [:enable, :start] end package "liblockfile-simple-perl" @@ -505,19 +629,31 @@ template "/usr/local/bin/cleanup-tiles" do source "cleanup-tiles.erb" owner "root" group "root" - mode 0755 + 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 -template "/etc/cron.d/cleanup-tiles" do - source "cleanup-tiles.cron.erb" - owner "root" - group "root" - mode 0644 - 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 + +tile_directories.each do |directory| + label = directory[1..].gsub("/", "-") + + service "cleanup-tiles@#{label}.timer" do + action [:enable, :start] + end end munin_plugin "mod_tile_fresh" @@ -531,6 +667,14 @@ munin_plugin "renderd_queue_time" munin_plugin "renderd_zoom" munin_plugin "renderd_zoom_time" -munin_plugin "replication_delay" do - conf "munin.erb" +munin_plugin "replication_delay" + +package "ruby-webrick" + +prometheus_exporter "modtile" do + port 9494 +end + +prometheus_exporter "renderd" do + port 9393 end