Route some additional API calls to cgimap

[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 5197ebbc7a70cb8f73c75a21912d6c5cb4aad501..d48ecd01d43925782e503c9ba9450b458617d412 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -171,7 +171,7 @@
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://amsterdam$1
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://amsterdam$1
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1

-  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1
+  ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways|relations))$ balancer://backend$1

   ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes
   ProxyPass /api/0.6/ways balancer://backend/api/0.6/ways
   ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations
   ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes
   ProxyPass /api/0.6/ways balancer://backend/api/0.6/ways
   ProxyPass /api/0.6/relations balancer://backend/api/0.6/relations


@@ -194,7 +194,7 @@
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness

-<% node[:web][:backends].each do |backend| -%>
+<% Array(node[:web][:backends]).each do |backend| -%>

     BalancerMember https://<%= backend %> disablereuse=on
 <% end -%>
   </Proxy>
     BalancerMember https://<%= backend %> disablereuse=on
 <% end -%>
   </Proxy>


@@ -291,13 +291,16 @@
 
   RewriteCond "%{HTTP:Accept-encoding}" "gzip"
   RewriteCond "%{REQUEST_FILENAME}\.gz" -s
 
   RewriteCond "%{HTTP:Accept-encoding}" "gzip"
   RewriteCond "%{REQUEST_FILENAME}\.gz" -s

-  RewriteRule "^(.*)\.(css|js|svg)$" "$1\.$2\.gz" [QSA]
+  RewriteRule "^(.*)\.(css|ico|js|json|svg|xml)$" "$1\.$2\.gz" [QSA]

 
   RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
 
   RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]

+  RewriteRule "\.ico\.gz$"  "-" [T=image/vnd.microsoft.icon,E=no-gzip:1]

   RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
   RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]

+  RewriteRule "\.json\.gz$"  "-" [T=application/json,E=no-gzip:1]

   RewriteRule "\.svg\.gz$"  "-" [T=image/svg+xml,E=no-gzip:1]
   RewriteRule "\.svg\.gz$"  "-" [T=image/svg+xml,E=no-gzip:1]

+  RewriteRule "\.xml\.gz$"  "-" [T=application/xml,E=no-gzip:1]

 
 

-  <FilesMatch "(\.js\.gz|\.css\.gz|\.svg\.gz)$">
+  <FilesMatch "\.(css|ico|js|json|svg|xml)\.gz$">

     Header append Content-Encoding gzip
     Header append Vary Accept-Encoding
   </FilesMatch>
     Header append Content-Encoding gzip
     Header append Vary Accept-Encoding
   </FilesMatch>