From: Tom Hughes <tom@compton.nu>
Date: Mon, 9 Sep 2013 11:16:00 +0000 (+0100)
Subject: Switch the mailman web interface to use https
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3922c25396b0aa995547e6caa3dc6f8b7e993f95?hp=d168351c5b49bd9689de106601c7267a19b7985b

Switch the mailman web interface to use https
---

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 4013058bc..94de38295 100644
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 
 package "mailman"
 
diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 396bcd56d..6b12ce994 100644
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -1,6 +1,16 @@
 # 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