Merge what remains of apache::ssl into apache::default

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index a24ea18f2f441844444d63794c2cdb921983e45f..72af9140b9b64b6c8caa034ece4c0a69c1cbb23c 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "ssl"
+
 package "apache2"
 package "libwww-perl"
 
@@ -69,6 +71,12 @@ apache_module "reqtimeout" do
   action [:disable]
 end
 
+apache_module "ssl"
+
+apache_conf "ssl" do
+  template "ssl.erb"
+end
+
 munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"