X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d228f465b5bf9f5dffedcebad5c7fadcbba21cc3..96ec481d8fc8db85b44daee8d87889d8fce909d4:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 9fa7fed85..1a274e223 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,23 +17,40 @@
 # limitations under the License.
 #
 
+include_recipe "ssl"
+
 package "apache2"
-package "apache2-mpm-#{node[:apache][:mpm]}"
+package "libwww-perl"
+
+%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
+  end
+end
 
 admins = data_bag_item("apache", "admins")
 
-template "/etc/apache2/httpd.conf" do
-  source "httpd.conf.erb"
+apache_conf "httpd" do
+  template "httpd.conf.erb"
+  notifies :reload, "service[apache2]"
+end
+
+template "/etc/apache2/ports.conf" do
+  source "ports.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 service "apache2" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
-  subscribes :restart, "package[apache2-mpm-#{node[:apache][:mpm]}]"
-  subscribes :reload, "template[/etc/apache2/httpd.conf]"
 end
 
 apache_module "info" do
@@ -46,8 +63,24 @@ apache_module "status" do
   variables :hosts => admins["hosts"]
 end
 
-apache_module "reqtimeout" do
-  action [ :disable ]
+apache_module "deflate" do
+  conf "deflate.conf.erb"
+end
+
+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"