Mitigate env HTTP_PROXY via cgi proxy header

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

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index e1e65bee45df6afd9397bea4e6158444eb87dc03..4545225976a6a42223db55d646f2ac8769611419 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -19,7 +19,7 @@
   #
   # Setup logging
   #
   #
   # Setup logging
   #

-  LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Ts" combined_with_time
+  LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus %{UNIQUE_ID}e %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_with_time

   CustomLog /var/log/apache2/access.log combined_with_time
   ErrorLog /var/log/apache2/error.log
 
   CustomLog /var/log/apache2/access.log combined_with_time
   ErrorLog /var/log/apache2/error.log
 


@@ -28,6 +28,11 @@
   #
   RewriteEngine on
 
   #
   RewriteEngine on
 

+  #
+  # Recover the unique ID from the request headers
+  #
+  SetEnvIf X-Request-Id ^(.*)$ UNIQUE_ID=$1
+

   #
   # Configure rails
   #
   #
   # Configure rails
   #


@@ -35,21 +40,31 @@
   RailsEnv production
   PassengerMinInstances 3
   PassengerMaxRequests 500
   RailsEnv production
   PassengerMinInstances 3
   PassengerMaxRequests 500

+<% if port == 443 -%>
+  PassengerPreStart https://www.openstreetmap.org/
+<% else -%>

   PassengerPreStart http://www.openstreetmap.org/
   PassengerPreStart http://www.openstreetmap.org/

+<% end -%>
+  SetEnv SECRET_KEY_BASE <%= @secret_key_base %>

 
   #
   # Get the real remote IP for requests via a trusted proxy
   #
   RemoteIPHeader X-Forwarded-For
   RemoteIPTrustedProxy 146.179.159.160/27
 
   #
   # Get the real remote IP for requests via a trusted proxy
   #
   RemoteIPHeader X-Forwarded-For
   RemoteIPTrustedProxy 146.179.159.160/27

+  RemoteIPTrustedProxy 10.0.32.0/24

 
   #
   # Pass supported calls to cgimap
   #
 
   #
   # Pass supported calls to cgimap
   #

-  RewriteRule ^/api/0\.6/map$ - [H=fcgi:127.0.0.1:8000]
+  RewriteRule ^/api/0\.6/map$ fcgi://127.0.0.1:8000$0 [P]

   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$

-  RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ - [H=fcgi:127.0.0.1:8000]
-  RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ - [H=fcgi:127.0.0.1:8000]
-  RewriteRule ^/api/0\.6/(nodes|ways|relations)$ - [H=fcgi:127.0.0.1:8000]
+  RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ fcgi://127.0.0.1:8000$0 [P]
+  RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ fcgi://127.0.0.1:8000$0 [P]
+  RewriteRule ^/api/0\.6/(nodes|ways|relations)$ fcgi://127.0.0.1:8000$0 [P]

 </VirtualHost>
 <% end -%>
 </VirtualHost>
 <% end -%>

+
+<Directory <%= node[:web][:base_directory] %>/rails/public>
+  Require all granted
+</Directory>