Switch stateofthemap.org to letsencrypt

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 00e314bed228ca807bc0dc3fdc3579d3370e602d..a707e0c72b5a16b7ae8caa7492c4b964b83ec4ac 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -29,6 +29,12 @@ git "/srv/stateofthemap.org" do
   group "root"
 end
 
   group "root"
 end
 

+ssl_certificate "stateofthemap.org" do
+  domains ["stateofthemap.org", "www.stateofthemap.org",
+           "stateofthemap.com", "www.stateofthemap.com"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "stateofthemap.org" do
   template "apache.erb"
   directory "/srv/stateofthemap.org"
 apache_site "stateofthemap.org" do
   template "apache.erb"
   directory "/srv/stateofthemap.org"

diff --git a/cookbooks/stateofthemap/templates/default/apache.erb b/cookbooks/stateofthemap/templates/default/apache.erb
index 53c3a79c8260d5abbf164362671219d6270b3fda..7ed9d9251c6456ea51269c1988c0b1fabb081d6e 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.erb
@@ -10,6 +10,7 @@
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         CustomLog /var/log/apache2/stateofthemap.org-access.log combined
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 

+        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 


@@ -23,6 +24,8 @@
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on

+        SSLCertificateFile /etc/ssl/certs/stateofthemap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/stateofthemap.org.key

 
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>
 
         RedirectPermanent / https://stateofthemap.org/
 </VirtualHost>


@@ -35,6 +38,8 @@
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on
         ErrorLog /var/log/apache2/stateofthemap.org-error.log
 
         SSLEngine on

+        SSLCertificateFile /etc/ssl/certs/stateofthemap.org.pem
+        SSLCertificateKeyFile /etc/ssl/private/stateofthemap.org.key

 
         DocumentRoot /srv/stateofthemap.org/html
 </VirtualHost>
 
         DocumentRoot /srv/stateofthemap.org/html
 </VirtualHost>