X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/030b284b1d91df3985bff215589989df9e6db0b7..571e5982cc82c4fbefff0d463895a029a68921fe:/cookbooks/tile/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 961d71ea2..ddc7e490e 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -20,7 +20,6 @@ include_recipe "accounts" include_recipe "apache" include_recipe "git" -include_recipe "munin" include_recipe "nodejs" include_recipe "postgresql" include_recipe "prometheus" @@ -100,18 +99,23 @@ tile_directories = node[:tile][:styles].collect do |_, style| style[:tile_directories].collect { |directory| directory[:name] } end.flatten.sort.uniq -package "renderd" +package %w[ + renderd + libgoogle-perftools4 +] systemd_service "renderd" do dropin "chef" after "postgresql.service" wants "postgresql.service" + 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 @@ -155,14 +159,11 @@ end package %w[ python3-cairo python3-mapnik + python3-pyotp python3-pyproj python3-setuptools ] -python_package "pyotp" do - python_version "3" -end - directory "/srv/tile.openstreetmap.org/cgi-bin" do owner "tile" group "tile" @@ -282,7 +283,7 @@ end nodejs_package "carto" -lowzoom_threads = [node.cpu_cores - 1, node[:memory][:total].to_f / 6291456].min.floor +lowzoom_threads = node.cpu_cores - 1 systemd_service "update-lowzoom@" do description "Low zoom tile update service for %i layer" @@ -299,6 +300,72 @@ systemd_service "update-lowzoom@" do restart "on-failure" end +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] + superuser true +end + +postgresql_user "tomh" do + cluster node[:tile][:database][:cluster] + 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 "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" +end + +postgresql_extension "postgis" do + cluster node[:tile][:database][:cluster] + database "gis" +end + +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" + owner "tile" + permissions "tile" => :all + end +end + +%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, "_renderd" => :select + end +end + directory "/srv/tile.openstreetmap.org/styles" do owner "tile" group "tile" @@ -382,6 +449,18 @@ node[:tile][:styles].each do |name, details| end end + if details[:functions_script] + postgresql_execute details[:functions_script] do + action :nothing + command details[:functions_script] + cluster node[:tile][:database][:cluster] + database "gis" + user "tile" + group "tile" + subscribes :run, "git[#{style_directory}]" + end + end + execute "#{style_directory}/project.mml" do action :nothing command "carto -a 3.0.22 project.mml > project.xml" @@ -394,72 +473,6 @@ node[:tile][:styles].each do |name, details| end end -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] - superuser true -end - -postgresql_user "tomh" do - cluster node[:tile][:database][:cluster] - 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 "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" -end - -postgresql_extension "postgis" do - cluster node[:tile][:database][:cluster] - database "gis" -end - -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" - owner "tile" - permissions "tile" => :all - end -end - -%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, "_renderd" => :select - end -end - package %w[ gdal-bin python3-yaml @@ -485,11 +498,6 @@ if node[:tile][:database][:external_data_script] end end -postgresql_munin "gis" do - cluster node[:tile][:database][:cluster] - database "gis" -end - directory File.dirname(node[:tile][:database][:node_file]) do owner "root" group "root" @@ -515,12 +523,19 @@ package %w[ pyosmium ] -directory "/var/lib/replicate" do +directory node[:tile][:replication][:directory] do owner "tile" group "tile" mode "755" end +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" @@ -571,17 +586,6 @@ template "/usr/local/bin/replicate-post" do mode "755" end -osm2pgsql_arguments = %w[ - --number-processes=1 - --log-progress=false - --expire-tiles=13-19 - --expire-output=/var/lib/replicate/dirty-tiles.txt - ] - -osm2pgsql_arguments.append("--multi-geometry") if node[:tile][:database][:multi_geometry] -osm2pgsql_arguments.append("--hstore") if node[:tile][:database][:hstore] -osm2pgsql_arguments.append("--tag-transform-script=#{node[:tile][:database][:tag_transform_script]}") if node[:tile][:database][:tag_transform_script] - systemd_service "replicate" do description "Rendering database replication service" after "postgresql.service" @@ -623,7 +627,7 @@ end systemd_timer "render-lowzoom" do description "Render low zoom tiles" - on_calendar "Fri *-*-* 23:00:00 UTC" + on_calendar "23:00 #{node[:timezone]}" end service "render-lowzoom.timer" do @@ -664,19 +668,6 @@ tile_directories.each do |directory| end end -munin_plugin "mod_tile_fresh" -munin_plugin "mod_tile_latency" -munin_plugin "mod_tile_response" -munin_plugin "mod_tile_zoom" - -munin_plugin "renderd_processed" -munin_plugin "renderd_queue" -munin_plugin "renderd_queue_time" -munin_plugin "renderd_zoom" -munin_plugin "renderd_zoom_time" - -munin_plugin "replication_delay" - package "ruby-webrick" prometheus_exporter "modtile" do