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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index ebf404945..625c3eb22 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,41 +17,42 @@
 # limitations under the License.
 #
 
-package "apache2"
-package "apache2-mpm-#{node[:apache][:mpm]}"
+include_recipe "ssl"
 
-#In Apache 2.4 mpm have become runtime loadable modules
-#Diable all mpm except the required mpm
-if node[:lsb][:release].to_f >= 14.04
-  mpms = ['event', 'itk', 'prefork', 'worker']
-  mpms.reject{|u| u == node[:apache][:mpm]}.each do |mpm|
-    apache_module mpm do
-      action [ :disable ]
+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]
+    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"
-  owner "root"
-  group "root"
-  mode 0644
+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
@@ -64,8 +65,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"