Switch trac to letsencrypt

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 6d42cb3a79b33b363aff60561fa320e62d5f7064..551f28e71c0470aacfafc5a16e64b9e4fc98ae9c 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -71,6 +71,12 @@ end
 
 apache_module "wsgi"
 
 
 apache_module "wsgi"
 

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

 apache_site site_name do
   template "apache.erb"
   directory site_directory
 apache_site site_name do
   template "apache.erb"
   directory site_directory

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index f309b50f83724f6ae19e6a8ed5a93a65cebeb2d6..ad9429bb1683aa795bb483794d70b195e01c3c98 100644 (file)
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -9,6 +9,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 

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

         RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 
         RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 


@@ -17,6 +18,8 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
         ServerAdmin webmaster@openstreetmap.org
 
         SSLEngine on
         ServerAdmin webmaster@openstreetmap.org
 
         SSLEngine on

+        SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+        SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key

 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log