X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3f966bbd9c321ce5377e33b9f920984e2bdcef7b..aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index bc0410fd3..5ab1b21ee 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,9 +37,7 @@ apache_module "mpm_#{node[:apache][:mpm]}" do
   action [:enable]
 end
 
-if node[:lsb][:release].to_f >= 18.04
-  apache_module "http2"
-end
+apache_module "http2"
 
 admins = data_bag_item("apache", "admins")
 
@@ -51,11 +50,13 @@ template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 service "apache2" do
   action [:enable, :start]
+  retries 2
+  retry_delay 10
   supports :status => true, :restart => true, :reload => true
 end