X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3922c25396b0aa995547e6caa3dc6f8b7e993f95..162eadf50c003831faf35ec26b9e3f0e1498c65f:/cookbooks/mailman/templates/default/apache.erb

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 6b12ce994..f5d61b17f 100644
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -7,6 +7,7 @@
         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>
 
@@ -15,6 +16,10 @@
 	ServerAdmin postmaster@openstreetmap.org
 	ServerSignature On
 
+        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
 	LogLevel warn
@@ -34,6 +39,7 @@
 	<Directory /var/lib/mailman/archives/>
 		Options Indexes FollowSymLinks
 		AllowOverride None
+		Require all granted
 	</Directory>
 
 	Alias /pipermail/ /var/lib/mailman/archives/public/
@@ -52,7 +58,7 @@
 	ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
 	ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
 
-	<Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009)">
+	<Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014|2015|2016)">
 		ExpiresActive On
 		ExpiresDefault "access plus 180 days"
 	</Location>