From cc8e0cbad842a38c9bae4659f24265844aa8e65f Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Wed, 19 Aug 2015 11:17:24 -0700
Subject: [PATCH] Switch to proxypass with retry=0 for etherpad

We think Apache may be caching 503 responses (possibly themselves
a result of [1]).  Set retry=0 so that we do not cache any failures
and switch to proxypass so that we can set that option.

[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=37770

Change-Id: Ibd1087bc8feb288bfb8f66f4e6de61ebe8414233
---
 templates/etherpadlite.vhost.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/etherpadlite.vhost.erb b/templates/etherpadlite.vhost.erb
index 918ad8a..fb92b3a 100644
--- a/templates/etherpadlite.vhost.erb
+++ b/templates/etherpadlite.vhost.erb
@@ -74,11 +74,11 @@
           RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]
           RewriteCond %{QUERY_STRING} transport=websocket    [NC]
           RewriteRule /(.*)           ws://localhost:9001/$1 [P,L]
-          ProxyPass        /socket.io http://localhost:9001
+          ProxyPass        /socket.io http://localhost:9001 retry=0
           ProxyPassReverse /socket.io http://localhost:9001
       </IfModule>
 
-      RewriteRule ^/(.*)$ http://localhost:9001/$1 [P]
+      ProxyPass  / http://localhost:9001/ retry=0
       ProxyPassReverse / http://localhost:9001/
   </IfModule>