summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@hp.com>2015-08-19 11:17:24 -0700
committerJames E. Blair <jeblair@hp.com>2015-08-19 11:19:13 -0700
commitcc8e0cbad842a38c9bae4659f24265844aa8e65f (patch)
tree0de70ce4807fcc99c7eb8b7bd476342ed0360a74
parent59dd1713ce25f75e12c7cfd1293ab438bfce36f0 (diff)
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
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 19 Aug 2015 18:35:37 +0000 Reviewed-on: https://review.openstack.org/214741 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--templates/etherpadlite.vhost.erb4
1 files 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 @@
74 RewriteCond %{REQUEST_URI} ^/socket.io [NC] 74 RewriteCond %{REQUEST_URI} ^/socket.io [NC]
75 RewriteCond %{QUERY_STRING} transport=websocket [NC] 75 RewriteCond %{QUERY_STRING} transport=websocket [NC]
76 RewriteRule /(.*) ws://localhost:9001/$1 [P,L] 76 RewriteRule /(.*) ws://localhost:9001/$1 [P,L]
77 ProxyPass /socket.io http://localhost:9001 77 ProxyPass /socket.io http://localhost:9001 retry=0
78 ProxyPassReverse /socket.io http://localhost:9001 78 ProxyPassReverse /socket.io http://localhost:9001
79 </IfModule> 79 </IfModule>
80 80
81 RewriteRule ^/(.*)$ http://localhost:9001/$1 [P] 81 ProxyPass / http://localhost:9001/ retry=0
82 ProxyPassReverse / http://localhost:9001/ 82 ProxyPassReverse / http://localhost:9001/
83 </IfModule> 83 </IfModule>
84 84