aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/httpd.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf
index 0a8323e69..d0cb89ebb 100644
--- a/conf/httpd.conf
+++ b/conf/httpd.conf
@@ -91,7 +91,10 @@ RewriteRule ^/alerts/?$ /alert [R=permanent,L]
RewriteRule ^/json/problems/new$ /json.cgi?type=new_problems [QSA,L]
RewriteRule ^/json/problems/fixed$ /json.cgi?type=fixed_problems [QSA,L]
-ProxyPass /tilma/ http://tilma.mysociety.org/
+# Proxy tilma so that our js code can make calls on the originating server. Use
+# a RewriteRule rather than ProxyPass so that Apache's processing order is more
+# predictable. ProxyPassReverse is not affected by this.
+RewriteRule /tilma/(.*) http://tilma.mysociety.org/$1 [P,L]
ProxyPassReverse /tilma/ http://tilma.mysociety.org/
# S. Cambs