X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/741593ee2bf203c9261f604d094e3d8e621698a8..4ed87e86c638523d093bc97b32715c4c6a41a70d:/cookbooks/tilelog/recipes/default.rb diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 0eefa7c7c..8151a3bf5 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,80 +17,55 @@ # limitations under the License. # -include_recipe "tools" +include_recipe "python" -package %w[ - gcc - make - autoconf - automake - libboost-filesystem-dev - libboost-system-dev - libboost-program-options-dev -] +passwords = data_bag_item("tilelog", "passwords") -tilelog_source_directory = node[:tilelog][:source_directory] -tilelog_input_directory = node[:tilelog][:input_directory] +tilelog_directory = "/opt/tilelog" tilelog_output_directory = node[:tilelog][:output_directory] -# resources for building the tile analysis binary -git tilelog_source_directory do - action :sync - repository "https://github.com/zerebubuth/openstreetmap-tile-analyze.git" - revision "live" - user "root" - group "root" - notifies :run, "execute[tilelog-autogen]", :immediately +python_virtualenv tilelog_directory do + interpreter "/usr/bin/python3" end -execute "tilelog-autogen" do - action :nothing - command "autoreconf -i" - cwd tilelog_source_directory - user "root" - group "root" - notifies :run, "execute[tilelog-configure]", :immediately -end - -execute "tilelog-configure" do - action :nothing - command "./configure --with-boost-libdir=/usr/lib/x86_64-linux-gnu" - cwd tilelog_source_directory - user "root" - group "root" - notifies :run, "execute[tilelog-build]", :immediately +python_package "tilelog" do + python_virtualenv tilelog_directory + python_version "3" + version "1.3.0" end -execute "tilelog-build" do - action :nothing - command "make" - cwd tilelog_source_directory - user "root" - group "root" +directory tilelog_output_directory do + user "www-data" + group "www-data" + mode "755" + recursive true end -# resources for running the tile analysis template "/usr/local/bin/tilelog" do source "tilelog.erb" owner "root" group "root" - mode 0o755 - variables :analyze_bin => "#{tilelog_source_directory}/openstreetmap-tile-analyze", - :input_dir => tilelog_input_directory, - :output_dir => tilelog_output_directory + mode "755" + variables :output_dir => tilelog_output_directory, + :aws_key => passwords["aws_key"] end -template "/etc/cron.d/tilelog" do - source "tilelog.cron.erb" - owner "root" - group "root" - mode 0o644 +systemd_service "tilelog" do + description "Tile log analysis" + user "www-data" + exec_start "/usr/local/bin/tilelog" + private_tmp true + private_devices true + protect_system "strict" + protect_home true + read_write_paths tilelog_output_directory end -# resources related to the output of the analysis and where it -# can be publicly downloaded. -directory tilelog_output_directory do - user "www-data" - group "www-data" - mode 0o755 +systemd_timer "tilelog" do + description "Tile log analysis" + on_calendar "*-*-* 01:07:00" +end + +service "tilelog.timer" do + action [:enable, :start] end