Drop attempt at SPF checking

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

diff --git a/cookbooks/kibana/templates/default/apache.erb b/cookbooks/kibana/templates/default/apache.erb
index b9f50de53f3e81e18b1c0d4ef8eb82a7725ffea1..2121eeda206fed599ae7e6fcc84bd65127f3b76f 100644 (file)
--- a/cookbooks/kibana/templates/default/apache.erb
+++ b/cookbooks/kibana/templates/default/apache.erb
@@ -4,9 +4,10 @@
    ServerName <%= @site %>
    ServerAdmin webmaster@openstreetmap.org
 
-   CustomLog /var/log/apache2/<%= @site %>-access.log combined
+   CustomLog /var/log/apache2/<%= @site %>-access.log combined_extended
    ErrorLog /var/log/apache2/<%= @site %>-error.log
 
+   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
    Redirect permanent / https://<%= @site %>/
 </VirtualHost>
 
@@ -14,11 +15,13 @@
    ServerName <%= @site %>
    ServerAdmin webmaster@openstreetmap.org
 
-   CustomLog /var/log/apache2/<%= @site %>-access.log combined
+   CustomLog /var/log/apache2/<%= @site %>-access.log combined_extended
    ErrorLog /var/log/apache2/<%= @site %>-error.log
 
    SSLEngine on
    SSLProxyEngine on
+   SSLCertificateFile /etc/ssl/certs/<%= @site %>.pem
+   SSLCertificateKeyFile /etc/ssl/private/<%= @site %>.key
 
    ProxyPass / http://127.0.0.1:<%= @port %>/