From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Feb 2017 10:10:08 +0000 (+0000)
Subject: Switch mediawiki sites to letsencrypt certificates
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1d07e74a1f0c16c2cfc3d5cac0eb6930d6d84bc1

Switch mediawiki sites to letsencrypt certificates
---

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index a3cb02ad1..0e173841c 100644
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -11,6 +11,8 @@
 
 <% if port == 443 -%>
   SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   CustomLog /var/log/apache2/<%= @name %>-secure-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-secure-error.log