X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d924fba4d5e22c9a16d5eebbc8f310d21f171959..97bb0b235c6af5123875e045136f67dd1e0d1625:/cookbooks/tilelog/recipes/default.rb diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 9596cd7fe..937022515 100644 --- a/cookbooks/tilelog/recipes/default.rb +++ b/cookbooks/tilelog/recipes/default.rb @@ -2,7 +2,7 @@ # Cookbook:: tilelog # Recipe:: default # -# Copyright:: 2014, OpenStreetMap Foundation +# Copyright:: 2014-2022, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ # limitations under the License. # +include_recipe "accounts" +include_recipe "planet::aws" include_recipe "python" passwords = data_bag_item("tilelog", "passwords") @@ -31,11 +33,12 @@ end python_package "tilelog" do python_virtualenv tilelog_directory python_version "3" + version "1.7.0" end directory tilelog_output_directory do - user "www-data" - group "www-data" + user "planet" + group "planet" mode "755" recursive true end @@ -49,10 +52,22 @@ template "/usr/local/bin/tilelog" do :aws_key => passwords["aws_key"] end -cron_d "tilelog" do - minute "17" - hour "22" - user "www-data" - command "/usr/local/bin/tilelog" - mailto "admins@openstreetmap.org" +systemd_service "tilelog" do + description "Tile log analysis" + user "planet" + exec_start "/usr/local/bin/tilelog" + nice 10 + sandbox :enable_network => true + protect_home "tmpfs" + bind_paths "/home/planet" + read_write_paths tilelog_output_directory +end + +systemd_timer "tilelog" do + description "Tile log analysis" + on_calendar "*-*-* 01:07:00" +end + +service "tilelog.timer" do + action [:enable, :start] end