X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6448ea6fd19e1f884e94a7adc40f971933c6ea3f..5239c5f1a1d13c8c34024e01f8c98282fa085181:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index be6457bc7..559fc83b0 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,52 +17,41 @@
 # limitations under the License.
 #
 
-package "apache2"
+include_recipe "ssl"
 
-if node[:lsb][:release].to_f < 14.04
-  package "apache2-mpm-#{node[:apache][:mpm]}" do
-    notifies :restart, "service[apache2]"
-  end
-else
-  ["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
+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")
 
-if node[:lsb][:release].to_f < 14.04
-  template "/etc/apache2/httpd.conf" do
-    source "httpd.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    notifies :reload, "service[apache2]"
-  end
-else
-  apache_conf "httpd" do
-    template "httpd.conf.erb"
-    notifies :reload, "service[apache2]"
-  end
+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
 end
 
@@ -76,8 +65,25 @@ 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 "headers"
+apache_module "ssl"
+
+apache_conf "ssl" do
+  template "ssl.erb"
 end
 
 munin_plugin "apache_accesses"