X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/559c32d3c6629da2e112a00f75e7319d89ee2d90..ff593b74e8a02eb714124ecabdf9451febc6ba32:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index a7073575c..eab19d75d 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"
@@ -116,7 +115,7 @@ systemd_service "renderd" do
   sandbox true
   restrict_address_families "AF_UNIX"
   read_write_paths tile_directories
-  system_call_filter ["@known"]
+  system_call_filter ["@system-service", "mincore"]
   restart "on-failure"
 end
 
@@ -287,7 +286,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"
@@ -490,11 +489,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"
@@ -520,12 +514,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"
@@ -576,17 +577,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"
@@ -628,7 +618,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
@@ -669,19 +659,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