X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/482cc410243348b3bfd01e688955b3504895f00f..f19679cb866e21ad614d1a9e28eaeab3e9ba0376:/cookbooks/apache/recipes/default.rb?ds=inline diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index 23206572a..4d91da140 100644 --- a/cookbooks/apache/recipes/default.rb +++ b/cookbooks/apache/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: apache +# Cookbook:: apache # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,46 +17,55 @@ # limitations under the License. # -package "apache2" +include_recipe "munin" +include_recipe "prometheus" +include_recipe "ssl" -if node[:lsb][:release].to_f < 14.04 - package "apache2-mpm-#{node[:apache][:mpm]}" do - notifies :restart, "service[apache2]" - end -else - ["event", "itk", "prefork", "worker"].each do |mpm| - if mpm == node[:apache][:mpm] - apache_module "mpm_#{mpm}" do - action [ :enable ] - end - else - apache_module "mpm_#{mpm}" do - action [ :disable ] - end - end +package %w[ + apache2 + libwww-perl +] + +%w[event itk prefork worker].each do |mpm| + next if mpm == node[:apache][:mpm] + + apache_module "mpm_#{mpm}" do + action [:disable] end end +apache_module "mpm_#{node[:apache][:mpm]}" do + action [:enable] +end + +apache_module "http2" + admins = data_bag_item("apache", "admins") -template "/etc/apache2/httpd.conf" do - source "httpd.conf.erb" - owner "root" - group "root" - mode 0644 +apache_conf "httpd" do + template "httpd.conf.erb" + notifies :reload, "service[apache2]" end template "/etc/apache2/ports.conf" do source "ports.conf.erb" owner "root" group "root" - mode 0644 + 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 ] + action [:enable, :start] + retries 2 + retry_delay 10 supports :status => true, :restart => true, :reload => true - subscribes :reload, "template[/etc/apache2/httpd.conf]" end apache_module "info" do @@ -69,10 +78,33 @@ apache_module "status" do variables :hosts => admins["hosts"] end -apache_module "reqtimeout" do - action [ :disable ] +apache_module "brotli" do + conf "brotli.conf.erb" +end + +apache_module "deflate" do + conf "deflate.conf.erb" +end + +apache_module "headers" +apache_module "ssl" + +apache_conf "ssl" do + template "ssl.erb" end 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 + options "--scrape_uri=http://localhost/server-status?auto" +end