Enable SSL for dns.osm.org

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index e2b41155d29c2fe9272ee637e251f36212a98873..4fbde88c06ffa0ddfaaabe0f66c14bc68bc7e0f2 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "git"
 #
 
 include_recipe "git"

-include_recipe "apache"
+include_recipe "apache::ssl"

 
 passwords = data_bag_item("dns", "passwords")
 
 
 passwords = data_bag_item("dns", "passwords")
 


@@ -71,6 +71,12 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   variables :zones => zones
 end
 
   variables :zones => zones
 end
 

+ssl_certificate "dns.openstreetmap.org" do
+  domains "dns.openstreetmap.org"
+  fallback_certificate "openstreetmap"
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "dns.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
 apache_site "dns.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"