From: Tom Hughes <tom@compton.nu>
Date: Sat, 11 Feb 2017 19:32:35 +0000 (+0000)
Subject: Issue letsencrypt certificates for wordpress sites
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1952990836d6687ed4030bb95ca5f9e535eaf61f?hp=7b2a06ac356bfd11ef6e5cbf714aae47f553dc16

Issue letsencrypt certificates for wordpress sites
---

diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb
index 91af9782b..b9181ed5e 100644
--- a/cookbooks/wordpress/metadata.rb
+++ b/cookbooks/wordpress/metadata.rb
@@ -8,5 +8,6 @@ version           "1.0.0"
 depends           "apache"
 depends           "chef"
 depends           "mysql"
+depends           "ssl"
 gem               "httpclient"
 gem               "php_serialize"
diff --git a/cookbooks/wordpress/providers/site.rb b/cookbooks/wordpress/providers/site.rb
index 36b6f5a3b..25c5aadb2 100644
--- a/cookbooks/wordpress/providers/site.rb
+++ b/cookbooks/wordpress/providers/site.rb
@@ -124,6 +124,10 @@ action :create do
     backup false
   end
 
+  ssl_certificate new_resource.name do
+    domains [new_resource.name] + Array(new_resource.aliases)
+  end
+
   apache_site new_resource.name do
     cookbook "wordpress"
     template "apache.erb"
diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 200c50089..b62705100 100644
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -12,6 +12,7 @@
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
 <% if @ssl_enabled -%>
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>