opendev/puppet-ethercalc
Code Issues Proposed changes

Fix websocket configuration

Browse Source 
Enable the proxy_websocket module.

Correct the ProxyPass directives in use with websockets.  The
current versions result in 404 on socket.io.js because they strip
the socket.io component of the path.

Change-Id: I3505b4e9693602ec04baec2487871ce57a6dc7a6
This commit is contained in:
James E. Blair 2015-09-02 10:13:28 -07:00
parent 021bc83b28
commit 605ec41b30
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/apache.pp
View File

@ -58,6 +58,10 @@ class etherpad_lite::apache (
notify => Service['httpd'], notify => Service['httpd'],
require => File['/etc/apache2/conf-available/connection-tuning'], require => File['/etc/apache2/conf-available/connection-tuning'],
} }
httpd_mod { 'proxy_wstunnel':
ensure => present,
}
} }
file { $docroot: file { $docroot:

4
templates/etherpadlite.vhost.erb
View File

@ -74,8 +74,8 @@
RewriteCond %{REQUEST_URI} ^/socket.io [NC] RewriteCond %{REQUEST_URI} ^/socket.io [NC]
RewriteCond %{QUERY_STRING} transport=websocket [NC] RewriteCond %{QUERY_STRING} transport=websocket [NC]
RewriteRule /(.*) ws://localhost:9001/$1 [P,L] RewriteRule /(.*) ws://localhost:9001/$1 [P,L]
ProxyPass /socket.io http://localhost:9001 retry=0 ProxyPass /socket.io http://localhost:9001/socket.io retry=0
ProxyPassReverse /socket.io http://localhost:9001 ProxyPassReverse /socket.io http://localhost:9001/socket.io
</IfModule> </IfModule>
ProxyPass / http://localhost:9001/ retry=0 ProxyPass / http://localhost:9001/ retry=0