Convert postgresql_munin to an LWRP

[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 6b12ce994ec951c57608360d88b0ec4ce80bb8df..2262c3fa280b4f19d68c921dcafebca51536c47b 100644 (file)
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -15,6 +15,8 @@
        ServerAdmin postmaster@openstreetmap.org
        ServerSignature On
 
        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
        CustomLog /var/log/apache2/<%= @name %>-access.log combined
        ErrorLog /var/log/apache2/<%= @name %>-error.log
        LogLevel warn


@@ -34,6 +36,7 @@
        <Directory /var/lib/mailman/archives/>
                Options Indexes FollowSymLinks
                AllowOverride None
        <Directory /var/lib/mailman/archives/>
                Options Indexes FollowSymLinks
                AllowOverride None

+               Require all granted

        </Directory>
 
        Alias /pipermail/ /var/lib/mailman/archives/public/
        </Directory>
 
        Alias /pipermail/ /var/lib/mailman/archives/public/


@@ -52,7 +55,7 @@
        ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
        ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
 
        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>
                ExpiresActive On
                ExpiresDefault "access plus 180 days"
        </Location>