X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..370a180df11efa7a03c44d702786e6dc39d7eb9d:/cookbooks/web/recipes/statistics.rb diff --git a/cookbooks/web/recipes/statistics.rb b/cookbooks/web/recipes/statistics.rb index c2f7d9b14..3ced1f4d6 100644 --- a/cookbooks/web/recipes/statistics.rb +++ b/cookbooks/web/recipes/statistics.rb @@ -19,20 +19,34 @@ include_recipe "web::base" -ruby = "ruby#{node[:passenger][:ruby_version]}" +ruby = "ruby#{node[:ruby][:version]}" rails_directory = "#{node[:web][:base_directory]}/rails" template "/usr/local/bin/statistics" do source "statistics.erb" owner "root" group "root" - mode 0o755 + mode "755" variables :ruby => ruby, :directory => rails_directory end -template "/etc/cron.d/statistics" do - source "statistics.cron.erb" - owner "root" - group "root" - mode 0o644 +systemd_service "web-statistics" do + description "Generate web statistics" + exec_start "/usr/local/bin/statistics" + user "rails" + sandbox :enable_network => true + read_write_paths "#{rails_directory}/tmp" +end + +systemd_timer "web-statistics" do + description "Generate web statistics" + on_calendar "00:00:00" +end + +cron_d "statistics" do + action :delete +end + +service "web-statistics.timer" do + action [:enable, :start] end