Remove traces of urmel

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 6a429a41f28432811a00a41152593535f0759b8d..b1e80892908bbed6ab8a9222bc0784afd55c1f67 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -71,18 +71,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 +91,7 @@ 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