Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* new version of our tcp proxy (now called vnc proxy) solves our "idl…

…e websocket never close" problem
  • Loading branch information...
commit dba4a54432d0a764ee79ae96d53158b2ffdf65cd 1 parent 2c64c9c
@dudemeister authored
Showing with 7 additions and 7 deletions.
  1. +3 −3 apache2.rb
  2. +4 −4 apache2/passenger_vhost.conf.erb
View
6 apache2.rb
@@ -271,7 +271,7 @@ def disable_mod(mod)
dep 'websocket_proxy.apache2' do
requires 'apache2-prefork-dev.managed'
met? {
- ["websocket_tcp_proxy", "websocket", "websocket_draft76"].all? {|name| sudo("a2enmod #{name}") }
+ ["websocket_vnc_proxy", "websocket", "websocket_draft76"].all? {|name| sudo("a2enmod #{name}") }
}
meet {
cd "/tmp" do
@@ -281,8 +281,8 @@ def disable_mod(mod)
["mod_websocket_draft76.c", "mod_websocket.c"].each do |c_file|
log_shell "installing ", "sudo apxs2 -cia #{c_file}"
end
- cd "examples" do
- log_shell "installing ", "sudo apxs2 -cia -I.. mod_websocket_tcp_proxy.c"
+ cd "vncproxy" do
+ log_shell "installing ", "sudo apxs2 -cia -I.. mod_websocket_vnc_proxy.c"
end
end
end
View
8 apache2/passenger_vhost.conf.erb
@@ -63,10 +63,10 @@ PassengerUseGlobalQueue on
RailsBaseURI /home/protonet/dashboard/current
RailsBaseURI /home/protonet/dashboard/current/mobile
- <IfModule mod_websocket_tcp_proxy.c>
+ <IfModule mod_websocket_vnc_proxy.c>
<Location /websocket>
SetHandler websocket-handler
- WebSocketHandler /usr/lib/apache2/modules/mod_websocket_tcp_proxy.so tcp_proxy_init
+ WebSocketHandler /usr/lib/apache2/modules/mod_websocket_vnc_proxy.so vnc_proxy_init
WebSocketTcpProxyHost localhost
WebSocketTcpProxyPort 5000
SupportDraft75 On
@@ -183,10 +183,10 @@ Listen *:8080
RailsBaseURI /home/protonet/dashboard/current
RailsBaseURI /home/protonet/dashboard/current/mobile
- <IfModule mod_websocket_tcp_proxy.c>
+ <IfModule mod_websocket_vnc_proxy.c>
<Location /websocket>
SetHandler websocket-handler
- WebSocketHandler /usr/lib/apache2/modules/mod_websocket_tcp_proxy.so tcp_proxy_init
+ WebSocketHandler /usr/lib/apache2/modules/mod_websocket_vnc_proxy.so vnc_proxy_init
WebSocketTcpProxyHost localhost
WebSocketTcpProxyPort 5000
SupportDraft75 On
Please sign in to comment.
Something went wrong with that request. Please try again.