put pummelzacken back into update mode

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 2b412eefca9fe0d270b6883425e2eec6bdb132ef..1a274e223b5e9605ea3fdca115a4a38884310029 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,49 +17,35 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "ssl"
+

 package "apache2"
 package "libwww-perl"
 
 package "apache2"
 package "libwww-perl"
 

-if node[:lsb][:release].to_f < 14.04
-  package "apache2-mpm-#{node[:apache][:mpm]}" do
-    notifies :restart, "service[apache2]"
-  end
-else
-  %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
+%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")
 
     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"
 end
 
 template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 service "apache2" do
 end
 
 service "apache2" do


@@ -81,8 +67,20 @@ apache_module "deflate" do
   conf "deflate.conf.erb"
 end
 
   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"
 end
 
 munin_plugin "apache_accesses"