X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f2fb9bfa575dfe8de24a4153333e033860270780..d0df16b1ad827a1bf5be089798db8ceadb737196:/cookbooks/apache/recipes/default.rb?ds=inline diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index c927b87b5..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 @@ -79,16 +86,6 @@ apache_module "deflate" do conf "deflate.conf.erb" end -if node[:apache][:reqtimeout] - apache_module "reqtimeout" do - action [:enable] - end -else - apache_module "reqtimeout" do - action [:disable] - end -end - apache_module "headers" apache_module "ssl" @@ -100,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" options "--scrape_uri=http://localhost/server-status?auto" end