X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..4ffc2ea14e4ca0db54934cd79551446528bf3c26:/cookbooks/mailman/templates/default/apache.erb

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 396bcd56d..2262c3fa2 100644
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -1,10 +1,22 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <VirtualHost *:80>
+        ServerName <%= @name %>
+        ServerAdmin postmaster@openstreetmap.org
+
+        CustomLog /var/log/apache2/<%= @name %>-access.log combined
+        ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+        RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
 	ServerName <%= @name %>
 	ServerAdmin postmaster@openstreetmap.org
 	ServerSignature On
 
+        SSLEngine on
+
 	CustomLog /var/log/apache2/<%= @name %>-access.log combined
 	ErrorLog /var/log/apache2/<%= @name %>-error.log
 	LogLevel warn
@@ -24,6 +36,7 @@
 	<Directory /var/lib/mailman/archives/>
 		Options Indexes FollowSymLinks
 		AllowOverride None
+		Require all granted
 	</Directory>
 
 	Alias /pipermail/ /var/lib/mailman/archives/public/
@@ -42,7 +55,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)">
 		ExpiresActive On
 		ExpiresDefault "access plus 180 days"
 	</Location>