X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/388687b7120815bc61f49de6c5dd0ea793dad67b..f2e8efe99b471cd5aef85977e6b22d024151c9a4:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 645bb0998..ead3638aa 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -1,8 +1,8 @@ # -# 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. @@ -433,8 +433,8 @@ end package %w[ osm2pgsql - osmosis ruby + osmium-tool pyosmium python-pyproj ] @@ -468,13 +468,6 @@ directory "/var/lib/replicate/expire-queue" do mode 0o775 end -template "/var/lib/replicate/configuration.txt" do - source "replicate.configuration.erb" - owner "tile" - group "tile" - mode 0o644 -end - template "/usr/local/bin/replicate" do source "replicate.erb" owner "root" @@ -539,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" @@ -579,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"