From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 22 Feb 2017 21:05:25 +0000 (-0500)
Subject: LP#1667091 Remove non-SSL websockets sample configs
X-Git-Tag: osrf_rel_2_5_0-rc~3
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=838aed4e78a69f5fef7a55f018f2659b0236f5ac;p=OpenSRF.git

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 <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

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
 </VirtualHost>
 
-# WebSockets via non-SSL
-Listen 7680
-NameVirtualHost *:7680
-<VirtualHost *:7680>
-    ServerName localhost:7680
-    ServerAlias 127.0.0.1:7680
-    DocumentRoot /var/www
-</VirtualHost>
-                                                                                
 # OpenSRF WebSockets gateway
 <Location /osrf-websocket-translator>
     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
 </VirtualHost>
 
-# WebSockets via non-SSL
-Listen 7680
-<VirtualHost *:7680>
-    ServerName localhost:7680
-    ServerAlias 127.0.0.1:7680
-    DocumentRoot /var/www
-</VirtualHost>
-                                                                                
 # OpenSRF WebSockets gateway
 <Location /osrf-websocket-translator>
     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;