X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ecf30bfd8157ca98f7c3f691c0266a09030ed4a3..5a207c66f87d1d119e0b3824345e1371e686eb7c:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 6a429a41f..f47d500b5 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -54,6 +54,13 @@ template "/etc/apache2/ports.conf" do
   mode "644"
 end
 
+systemd_service "apache2" do
+  dropin "chef"
+  memory_high "50%"
+  memory_max "75%"
+  notifies :restart, "service[apache2]"
+end
+
 service "apache2" do
   action [:enable, :start]
   retries 2
@@ -71,18 +78,12 @@ apache_module "status" do
   variables :hosts => admins["hosts"]
 end
 
-apache_module "deflate" do
-  conf "deflate.conf.erb"
+apache_module "brotli" do
+  conf "brotli.conf.erb"
 end
 
-if node[:apache][:reqtimeout]
-  apache_module "reqtimeout" do
-    action [:enable]
-  end
-else
-  apache_module "reqtimeout" do
-    action [:disable]
-  end
+apache_module "deflate" do
+  conf "deflate.conf.erb"
 end
 
 apache_module "headers"
@@ -97,9 +98,6 @@ munin_plugin "apache_processes"
 munin_plugin "apache_volume"
 
 prometheus_exporter "apache" do
-  github_owner "Lusitaniae"
-  version "0.8.0"
   port 9117
-  listen_switch "telemetry.address"
-  options "-scrape_uri http://localhost/server-status?auto"
+  options "--scrape_uri=http://localhost/server-status?auto"
 end