X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d694a499dfccf56d6290decf56809866cc7b21c6..c9720dd433ab1d7c898801c2e90aba97048c138f:/cookbooks/tile/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 2e19e9b0e..ead3638aa 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, @@ -21,6 +21,7 @@ include_recipe "apache" include_recipe "git" include_recipe "nodejs" include_recipe "postgresql" +include_recipe "python" include_recipe "tools" blocks = data_bag_item("tile", "blocks") @@ -37,6 +38,11 @@ apache_module "tile" do conf "tile.conf.erb" 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] } apache_site "default" do @@ -76,11 +82,13 @@ systemd_service "renderd" do private_network true protect_system "full" protect_home true + no_new_privileges true restart "on-failure" end service "renderd" do action [:enable, :start] + subscribes :restart, "systemd_service[renderd]" end directory "/srv/tile.openstreetmap.org/tiles" do @@ -115,16 +123,31 @@ template "/srv/tile.openstreetmap.org/html/index.html" do mode 0o644 end -package "python-cairo" -package "python-mapnik" -package "python-setuptools" +package %w[ + python-cairo + python-mapnik + python-setuptools +] -easy_install_package "pyotp" +python_package "pyotp" -package "fonts-noto-cjk" -package "fonts-noto-hinted" -package "fonts-noto-unhinted" -package "ttf-unifont" +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 0o644 + end +end directory "/srv/tile.openstreetmap.org/cgi-bin" do owner "tile" @@ -240,7 +263,7 @@ nodejs_package "millstone" systemd_service "update-lowzoom@" do description "Low zoom tile update service for %i layer" user "tile" - exec_start "/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 @@ -335,9 +358,10 @@ node[:tile][:styles].each do |name, details| 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] @@ -367,7 +391,12 @@ 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" +end + +%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table| postgresql_table table do cluster node[:tile][:database][:cluster] database "gis" @@ -376,7 +405,7 @@ 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].each do |table| postgresql_table table do cluster node[:tile][:database][:cluster] database "gis" @@ -393,7 +422,7 @@ end file node[:tile][:node_file] do owner "tile" group "www-data" - mode 0o640 + mode 0o660 end directory "/var/log/tile" do @@ -402,26 +431,22 @@ directory "/var/log/tile" do mode 0o755 end -package "osm2pgsql" -package "osmosis" +package %w[ + osm2pgsql + ruby + osmium-tool + pyosmium + python-pyproj +] -package "ruby" -package "ruby-dev" - -package "libproj-dev" -package "libxml2-dev" - -gem_package "proj4rb" -gem_package "libxml-ruby" - -remote_directory "/usr/local/lib/site_ruby" do - source "ruby" +remote_directory "/usr/local/bin" do + source "bin" owner "root" group "root" mode 0o755 files_owner "root" files_group "root" - files_mode 0o644 + files_mode 0o755 end template "/usr/local/bin/expire-tiles" do @@ -431,24 +456,16 @@ template "/usr/local/bin/expire-tiles" do mode 0o755 end -template "/etc/sudoers.d/tile" do - source "sudoers.erb" - owner "root" - group "root" - mode 0o440 -end - directory "/var/lib/replicate" do owner "tile" group "tile" mode 0o755 end -template "/var/lib/replicate/configuration.txt" do - source "replicate.configuration.erb" +directory "/var/lib/replicate/expire-queue" do owner "tile" - group "tile" - mode 0o644 + group "www-data" + mode 0o775 end template "/usr/local/bin/replicate" do @@ -458,6 +475,29 @@ template "/usr/local/bin/replicate" do mode 0o755 end +systemd_service "expire-tiles" do + description "Tile dirtying service" + type "simple" + user "www-data" + 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 +end + +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] + subscribes :restart, "systemd_path[expire-tiles]" +end + systemd_service "replicate" do description "Rendering database replication service" after "postgresql.service" @@ -468,6 +508,7 @@ systemd_service "replicate" do private_devices true protect_system "full" protect_home true + no_new_privileges true restart "on-failure" end @@ -491,11 +532,29 @@ template "/usr/local/bin/render-lowzoom" do mode 0o755 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" + 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 +end + +systemd_timer "render-lowzoom" do + description "Render low zoom tiles" + on_calendar "Sun *-*~07/1 01:00:00" +end + +service "render-lowzoom.timer" do + action [:enable, :start] +end + +file "/etc/cron.d/render-lowzoom" do + action :delete end package "liblockfile-simple-perl" @@ -531,6 +590,4 @@ munin_plugin "renderd_queue_time" munin_plugin "renderd_zoom" munin_plugin "renderd_zoom_time" -munin_plugin "replication_delay" do - conf "munin.erb" -end +munin_plugin "replication_delay"