dns: upgrade dnscontrol to 4.12.5

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

diff --git a/cookbooks/matomo/recipes/default.rb b/cookbooks/matomo/recipes/default.rb
index a14a76954bb9f80411020ff09d645b5d129737a9..5557d78d09a878067ca60e0f7a21fb1e928eef53 100644 (file)
--- a/cookbooks/matomo/recipes/default.rb
+++ b/cookbooks/matomo/recipes/default.rb
@@ -37,6 +37,8 @@ package %w[
 ]
 
 apache_module "expires"
 ]
 
 apache_module "expires"

+apache_module "proxy"
+apache_module "proxy_fcgi"

 apache_module "rewrite"
 
 version = node[:matomo][:version]
 apache_module "rewrite"
 
 version = node[:matomo][:version]


@@ -201,9 +203,10 @@ end
 
 systemd_service "matomo-archive" do
   description "Matomo report archiving"
 
 systemd_service "matomo-archive" do
   description "Matomo report archiving"

-  exec_start "/usr/bin/php /srv/matomo.openstreetmap.org/console core:archive --quiet --url=https://matomo.openstreetmap.org/"
+  exec_start "/usr/bin/php /srv/matomo.openstreetmap.org/console core:archive --url=https://matomo.openstreetmap.org/"

   user "www-data"
   sandbox true
   user "www-data"
   sandbox true

+  proc_subset "all"

   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
   read_write_paths "/opt/matomo-#{version}/matomo/tmp"
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
   read_write_paths "/opt/matomo-#{version}/matomo/tmp"


@@ -211,7 +214,8 @@ end
 
 systemd_timer "matomo-archive" do
   description "Matomo report archiving"
 
 systemd_timer "matomo-archive" do
   description "Matomo report archiving"

-  on_calendar "00:05"
+  on_boot_sec "30m"
+  on_unit_inactive_sec "30m"

 end
 
 service "matomo-archive.timer" do
 end
 
 service "matomo-archive.timer" do