Accept any mail that passes an osmfoundation.org SPF check

[chef.git] / cookbooks / exim / templates / default / apache-mta-sts.erb

diff --git a/cookbooks/exim/templates/default/apache-mta-sts.erb b/cookbooks/exim/templates/default/apache-mta-sts.erb
index 794a52aab642d5ae0e80487b5abb567f966e0abb..da7ccddbaa5c6f0485f132b0eae12f165b65069e 100644 (file)
--- a/cookbooks/exim/templates/default/apache-mta-sts.erb
+++ b/cookbooks/exim/templates/default/apache-mta-sts.erb
@@ -7,7 +7,7 @@
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
@@ -22,9 +22,13 @@
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   Alias /.well-known/mta-sts.txt <%= @directory %>/<%= domain %>.txt
 </VirtualHost>
 <% end -%>
+
+<Directory <%= @directory %>>
+  Require all granted
+</Directory>