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

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 6c0127ea20e82cd609b9d4fd56bca1fdb6353bba..faf12775c9bc848c1e63f823552b985784cbf1f3 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"
@@ -59,9 +59,8 @@ execute "/srv/blogs.openstreetmap.org" do
   group "blogs"
 end
 
-ssl_certificate "blops.openstreetmap.org" do
+ssl_certificate "blogs.openstreetmap.org" do
   domains "blogs.openstreetmap.org"
-  fallback_certificate "openstreetmap"
   notifies :reload, "service[apache2]"
 end