From: Ben Shum <ben@evergreener.net>
Date: Fri, 26 Jul 2019 14:43:24 +0000 (-0400)
Subject: Only include the used option for websocketd
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1aa426487300cf501aa018db9bb8ebcb75cfd0f6;p=working%2Frandom.git

Only include the used option for websocketd

The instructions include two ways of starting websocketd, only
apply one of them.

Signed-off-by: Ben Shum <ben@evergreener.net>
---

diff --git a/installer/stretch/eg_stretch_installer.sh b/installer/stretch/eg_stretch_installer.sh
index 5112d2ff2..f0caf619b 100755
--- a/installer/stretch/eg_stretch_installer.sh
+++ b/installer/stretch/eg_stretch_installer.sh
@@ -590,22 +590,13 @@ function configure_websockets {
     a2enmod ssl  
     echo Return Value = $?
 
-    echo Run websocketd, choosing option a or b, below:
-
-    echo 'a. Run websocketd as opensrf (optional)'
-
-    echo /usr/local/bin/websocketd --port 7682 /openils/bin/osrf-websocket-stdio &
-    echo # Other useful command line parameters include:
-    echo # --loglevel debug|trace|access|info|error|fatal
-    echo # --maxforks <n>
-    echo # --sameorigin=true
-    echo # --origin=host[:port][,host[:port]...]
-    echo # See https://github.com/joewalnes/websocketd/blob/master/help.go
+    echo Run websocketd, choosing option b:
 
     echo 'b. Run websocketd without a proxy (chosen)'
 
-    /usr/local/bin/websocketd --port 7682 --ssl --sslcert=/etc/apache2/ssl/server.crt \
-     --sslkey=/etc/apache2/ssl/server.key /openils/bin/osrf-websocket-stdio &
+    /usr/local/bin/websocketd --port 7682 --ssl --sslcert=/etc/apache2/ssl/server.crt --sslkey=/etc/apache2/ssl/server.key /openils/bin/osrf-websocket-stdio &
+
+    echo Return Value = $?
 
     echo End of configuring websockets =~-._
 }