community: bump version - dummy text change

[chef.git] / cookbooks / web / templates / default / apache.frontend.erb

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 4ee4c459cf769eef7dc17cab194eb154d5e9e09c..39f2a6007118589c89b429af84ad23ca7087bb79 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -26,6 +26,12 @@ ErrorLog /var/log/apache2/error.log
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
 
   SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
   SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
 

+  # Get the real remote IP for requests via a trusted proxy
+  RemoteIPHeader CF-Connecting-IP
+<% @cloudflare.sort.each do |address| -%>
+  RemoteIPTrustedProxy <%= address %>
+<% end -%>
+

   #
   # Turn on various features
   #
   #
   # Turn on various features
   #


@@ -35,8 +41,7 @@ ErrorLog /var/log/apache2/error.log
   #
   # Configure timeouts
   #
   #
   # Configure timeouts
   #

-  TimeOut 10
-  RequestReadTimeout handshake=10-20,MinRate=500 header=10-20,MinRate=500 body=10-120,MinRate=500
+  RequestReadTimeout handshake=20-40,MinRate=500 header=20-40,MinRate=500 body=20-120,MinRate=500

   LogLevel reqtimeout:info
 
   #
   LogLevel reqtimeout:info
 
   #


@@ -118,7 +123,7 @@ ErrorLog /var/log/apache2/error.log
     FileETag Size
 
     ExpiresDefault "access plus 1 year"
     FileETag Size
 
     ExpiresDefault "access plus 1 year"

-    Header set Cache-Control "immutable, max-age=31536000"
+    Header set Cache-Control "immutable, max-age=31536000" "expr=%{REQUEST_STATUS} == 200"

   </Location>
 
   #
   </Location>
 
   #