X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1166c6840b332186433bc8b15ab4dfa13bcf1bd5..5b9accd8fdcb250bc289537763e837fe088dc363:/cookbooks/apache/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 989755f67..59d45d09d 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# 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.
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "munin"
 include_recipe "ssl"
 
 package %w[
@@ -36,6 +37,8 @@ apache_module "mpm_#{node[:apache][:mpm]}" do
   action [:enable]
 end
 
+apache_module "http2"
+
 admins = data_bag_item("apache", "admins")
 
 apache_conf "httpd" do
@@ -52,6 +55,8 @@ end
 
 service "apache2" do
   action [:enable, :start]
+  retries 2
+  retry_delay 10
   supports :status => true, :restart => true, :reload => true
 end