Update to tilelog v1.5.0

[chef.git] / cookbooks / tilelog / recipes / default.rb

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 7e356e50a357a82a200c4d44a3829435e36a2b2f..9ab18f93b1159023aaacf00cd7f79a5bdd1aae36 100644 (file)
--- 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.
@@ -21,10 +21,17 @@ include_recipe "python"
 
 passwords = data_bag_item("tilelog", "passwords")
 
+tilelog_directory = "/opt/tilelog"
 tilelog_output_directory = node[:tilelog][:output_directory]
 
+python_virtualenv tilelog_directory do
+  interpreter "/usr/bin/python3"
+end
+
 python_package "tilelog" do
+  python_virtualenv tilelog_directory
   python_version "3"
+  version "1.5.0"
 end
 
 directory tilelog_output_directory do
@@ -34,7 +41,7 @@ directory tilelog_output_directory do
   recursive true
 end
 
-template "/usr/local/bin/generate-tilelog" do
+template "/usr/local/bin/tilelog" do
   source "tilelog.erb"
   owner "root"
   group "root"
@@ -43,10 +50,20 @@ template "/usr/local/bin/generate-tilelog" do
             :aws_key => passwords["aws_key"]
 end
 
-cron_d "tilelog" do
-  minute "17"
-  hour "22"
+systemd_service "tilelog" do
+  description "Tile log analysis"
   user "www-data"
-  command "/usr/local/bin/generate-tilelog"
-  mailto "admins@openstreetmap.org"
+  exec_start "/usr/local/bin/tilelog"
+  nice 10
+  sandbox :enable_network => true
+  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