Install bundler 2.1.4 for rails

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 3d83e2ebf0de9ec877ad3aeb7f345c3e967bd6fd..5ab1b21eebe6da9f547310408ec00492cd32f077 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# 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.
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

+include_recipe "munin"

 include_recipe "ssl"
 
 package %w[
 include_recipe "ssl"
 
 package %w[


@@ -49,11 +50,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