X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/92837c0f85ab30e0793bfb1010cfc126ce6d3dde..19aeb7bfffb852ab8be005c004b1ef8e555a5b77:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index d9bcaba1b..625c3eb22 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,10 +17,14 @@
 # limitations under the License.
 #
 
-package "apache2"
-package "libwww-perl"
+include_recipe "ssl"
 
-%w(event itk prefork worker).each do |mpm|
+package %w[
+  apache2
+  libwww-perl
+]
+
+%w[event itk prefork worker].each do |mpm|
   if mpm == node[:apache][:mpm]
     apache_module "mpm_#{mpm}" do
       action [:enable]
@@ -43,7 +47,7 @@ template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 service "apache2" do
@@ -65,8 +69,20 @@ 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 "ssl"
+
+apache_conf "ssl" do
+  template "ssl.erb"
 end
 
 munin_plugin "apache_accesses"