X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/92837c0f85ab30e0793bfb1010cfc126ce6d3dde..9626c2e9e81b53134c416cca0594fad46aa2dc01:/cookbooks/apache/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index d9bcaba1b..d443f1e40 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,21 +17,29 @@ # limitations under the License. # -package "apache2" -package "libwww-perl" - -%w(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 +include_recipe "munin" +include_recipe "prometheus" +include_recipe "ssl" + +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") apache_conf "httpd" do @@ -43,11 +51,13 @@ template "/etc/apache2/ports.conf" do source "ports.conf.erb" owner "root" group "root" - mode 0644 + mode "644" end service "apache2" do action [:enable, :start] + retries 2 + retry_delay 10 supports :status => true, :restart => true, :reload => true end @@ -65,10 +75,29 @@ apache_module "deflate" do conf "deflate.conf.erb" end -apache_module "reqtimeout" do - action [:disable] +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" + +apache_conf "ssl" do + template "ssl.erb" end munin_plugin "apache_accesses" munin_plugin "apache_processes" munin_plugin "apache_volume" + +prometheus_exporter "apache" do + port 9117 + listen_switch "telemetry.address" + options "--scrape_uri=http://localhost/server-status?auto" +end