Switch the mailman web interface to use https

[chef.git] / cookbooks / mailman / templates / default / apache.erb

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 396bcd56d85dd7d10590f2590eb3626e67682e5d..6b12ce994ec951c57608360d88b0ec4ce80bb8df 100644 (file)
--- 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>
 # 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
        ServerName <%= @name %>
        ServerAdmin postmaster@openstreetmap.org
        ServerSignature On