Bump cookstyle from 6.20.1 to 6.20.2

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 1a274e223b5e9605ea3fdca115a4a38884310029..d443f1e409ce5eff9c76c861ca67f2bddb176583 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: apache
+# Cookbook:: apache

 # Recipe:: default
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,23 +17,29 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "munin"
+include_recipe "prometheus"

 include_recipe "ssl"
 
 include_recipe "ssl"
 

-package "apache2"
-package "libwww-perl"
+package %w[
+  apache2
+  libwww-perl
+]

 
 %w[event itk prefork worker].each do |mpm|
 
 %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
+  next if mpm == node[:apache][:mpm]
+
+  apache_module "mpm_#{mpm}" do
+    action [:disable]

   end
 end
 
   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
 admins = data_bag_item("apache", "admins")
 
 apache_conf "httpd" do


@@ -45,11 +51,13 @@ template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
   source "ports.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 service "apache2" do
   action [:enable, :start]
 end
 
 service "apache2" do
   action [:enable, :start]

+  retries 2
+  retry_delay 10

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -77,6 +85,7 @@ else
   end
 end
 
   end
 end
 

+apache_module "headers"

 apache_module "ssl"
 
 apache_conf "ssl" do
 apache_module "ssl"
 
 apache_conf "ssl" do


@@ -86,3 +95,9 @@ end
 munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"
 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