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

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 3c5dafe250b2d8f56949c2b0a69f70ab17e5bd70..08af7112be3deab9fa103d5d018cd8ef04a4e901 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -201,6 +201,11 @@ if node[:postgresql][:clusters][:"9.5/main"]
         notifies :run, "execute[#{rails_directory}]"
       end
 
+      ssl_certificate site_name do
+        domains [site_name] + site_aliases
+        notifies :reload, "service[apache2]"
+      end
+
       apache_site site_name do
         template "apache.rails.erb"
         variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
@@ -241,6 +246,11 @@ if node[:postgresql][:clusters][:"9.5/main"]
     mode 0o644
   end
 
+  ssl_certificate "apis.dev.openstreetmap.org" do
+    domains "apis.dev.openstreetmap.org"
+    notifies :reload, "service[apache2]"
+  end
+
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end