X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f38f3374703b5a86709ce9edadf139c09b3cf3c6..eaf2ba261061613a6e23f6514afeb4f50817db66:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index e5f30a410..4d91da140 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"
@@ -96,8 +97,14 @@ munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"
 
+template "/var/lib/prometheus/node-exporter/apache.prom" do
+  source "apache.prom.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 prometheus_exporter "apache" do
   port 9117
-  listen_switch "telemetry.address"
-  exporter_options "-scrape_uri http://localhost/server-status?auto"
+  options "--scrape_uri=http://localhost/server-status?auto"
 end