X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..98e37149cc90096789ab9c226ac444559008b293:/cookbooks/taginfo/recipes/default.rb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index ba25e9984..818561930 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -23,6 +23,8 @@ include_recipe "accounts" include_recipe "apache" include_recipe "git" include_recipe "passenger" +include_recipe "planet::current" +include_recipe "prometheus" include_recipe "ruby" package %w[ @@ -68,6 +70,27 @@ template "/etc/sudoers.d/taginfo" do mode "440" end +systemd_service "taginfo-update@" do + description "Taginfo update for %i" + wants "planet-update.service" + after "planet-update.service" + exec_start "/srv/%i/bin/update" + user "taginfo" + sandbox :enable_network => true + restrict_address_families "AF_UNIX" + read_write_paths [ + "/srv/%i/data", + "/srv/%i/download", + "/srv/%i/sources", + "/var/log/taginfo/%i" + ] +end + +systemd_timer "taginfo-update@" do + description "Taginfo update for %i" + on_calendar "01:37" +end + node[:taginfo][:sites].each do |site| site_name = site[:name] site_aliases = Array(site[:aliases]) @@ -139,7 +162,7 @@ node[:taginfo][:sites].each do |site| settings["opensearch"]["contact"] = "webmaster@openstreetmap.org" settings["paths"]["bin_dir"] = "#{directory}/build/src" settings["sources"]["download"] = "" - settings["sources"]["create"] = "db languages projects wiki chronology" + settings["sources"]["create"] = "db languages projects wiki wikidata chronology" settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.osh.pbf" settings["sources"]["chronology"]["osm_history_file"] = "/var/lib/planet/planet.osh.pbf" settings["tagstats"]["geodistribution"] = "DenseMmapArray" @@ -193,12 +216,15 @@ node[:taginfo][:sites].each do |site| directory "#{directory}/taginfo/web/public" variables :aliases => site_aliases end -end -template "/usr/local/bin/taginfo-update" do - source "taginfo-update.erb" - owner "root" - group "root" - mode "755" - variables :sites => node[:taginfo][:sites] + service "taginfo-update@#{site_name}.timer" do + action [:enable, :start] + end + + prometheus_collector "taginfo-#{site_name}" do + interval "15m" + user "taginfo" + path "#{directory}/taginfo/sources/metrics.rb" + options "#{directory}/data" + end end