Revert "Disable collection of bgwriter statistics for postgres 17"

[chef.git] / cookbooks / web / recipes / statistics.rb

diff --git a/cookbooks/web/recipes/statistics.rb b/cookbooks/web/recipes/statistics.rb
index 3ced1f4d61754075582940aebb5efe39f44fd75d..88c85a6fe7ba4d0bacb40423d65f65ac2986718b 100644 (file)
--- a/cookbooks/web/recipes/statistics.rb
+++ b/cookbooks/web/recipes/statistics.rb
@@ -19,7 +19,6 @@
 
 include_recipe "web::base"
 
 
 include_recipe "web::base"
 

-ruby = "ruby#{node[:ruby][:version]}"

 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 template "/usr/local/bin/statistics" do
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 template "/usr/local/bin/statistics" do


@@ -27,15 +26,19 @@ template "/usr/local/bin/statistics" do
   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"

-  variables :ruby => ruby, :directory => rails_directory
+  variables :ruby => node[:ruby][:interpreter], :directory => rails_directory

 end
 
 systemd_service "web-statistics" do
   description "Generate web statistics"
 end
 
 systemd_service "web-statistics" do
   description "Generate web statistics"

-  exec_start "/usr/local/bin/statistics"
+  environment "RAILS_ENV" => "production",
+              "SECRET_KEY_BASE_DUMMY" => "1"

   user "rails"
   user "rails"

+  working_directory rails_directory
+  exec_start "/usr/local/bin/statistics"

   sandbox :enable_network => true
   sandbox :enable_network => true

-  read_write_paths "#{rails_directory}/tmp"
+  memory_deny_write_execute false
+  read_write_paths ["#{rails_directory}/tmp", "/var/log/web"]

 end
 
 systemd_timer "web-statistics" do
 end
 
 systemd_timer "web-statistics" do


@@ -43,10 +46,6 @@ systemd_timer "web-statistics" do
   on_calendar "00:00:00"
 end
 
   on_calendar "00:00:00"
 end
 

-cron_d "statistics" do
-  action :delete
-end
-

 service "web-statistics.timer" do
   action [:enable, :start]
 end
 service "web-statistics.timer" do
   action [:enable, :start]
 end