X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b98a1b8f0ddc17ebf934add6fc310931d72805c8..162eadf50c003831faf35ec26b9e3f0e1498c65f:/cookbooks/mailman/templates/default/apache.erb?ds=sidebyside
diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 7e4007962..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 %>/
@@ -16,6 +17,8 @@
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
@@ -36,6 +39,7 @@
Options Indexes FollowSymLinks
AllowOverride None
+ Require all granted
Alias /pipermail/ /var/lib/mailman/archives/public/
@@ -54,7 +58,7 @@
ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
-
+
ExpiresActive On
ExpiresDefault "access plus 180 days"