From 2fc52cfaab0f2f0a5f9a1bc37b0ecb5deb6edda4 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 22 Feb 2017 16:05:25 -0500 Subject: [PATCH] LP#1667091 Remove non-SSL websockets sample configs All WebSockets communication occurs via SSL in the sample configuration files. Non-SSL communication is still an option if required with local configuration. Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- examples/apache2/websockets/apache2.conf | 9 --------- examples/apache_24/websockets/apache2.conf | 8 -------- examples/nginx/osrf-ws-http-proxy | 2 +- 3 files changed, 1 insertions(+), 18 deletions(-) diff --git a/examples/apache2/websockets/apache2.conf b/examples/apache2/websockets/apache2.conf index b04f3d7..7afa8f0 100644 --- a/examples/apache2/websockets/apache2.conf +++ b/examples/apache2/websockets/apache2.conf @@ -57,15 +57,6 @@ NameVirtualHost *:7682 SSLCertificateKeyFile /etc/apache2/ssl/server.key -# WebSockets via non-SSL -Listen 7680 -NameVirtualHost *:7680 - - ServerName localhost:7680 - ServerAlias 127.0.0.1:7680 - DocumentRoot /var/www - - # OpenSRF WebSockets gateway SetHandler websocket-handler diff --git a/examples/apache_24/websockets/apache2.conf b/examples/apache_24/websockets/apache2.conf index 64e6a4c..8bf3657 100644 --- a/examples/apache_24/websockets/apache2.conf +++ b/examples/apache_24/websockets/apache2.conf @@ -63,14 +63,6 @@ Listen 7682 SSLCertificateKeyFile /etc/apache2/ssl/server.key -# WebSockets via non-SSL -Listen 7680 - - ServerName localhost:7680 - ServerAlias 127.0.0.1:7680 - DocumentRoot /var/www - - # OpenSRF WebSockets gateway SetHandler websocket-handler diff --git a/examples/nginx/osrf-ws-http-proxy b/examples/nginx/osrf-ws-http-proxy index efa929c..d079230 100644 --- a/examples/nginx/osrf-ws-http-proxy +++ b/examples/nginx/osrf-ws-http-proxy @@ -35,7 +35,7 @@ server { } location /osrf-websocket-translator { - proxy_pass http://localhost:7680; + proxy_pass https://localhost:7682; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -- 1.7.2.5