From a327ca468d2f66d6d8b59170df37cd3c57f1bf34 Mon Sep 17 00:00:00 2001
From: Andy Witter <awitter@georgialibraries.org>
Date: Tue, 12 Jan 2016 17:03:25 -0500
Subject: [PATCH] Add support for websockets port TCP/7682 in ldirectord and
 add https check_https script to https block in ldirectord

---
 GenaSYS.sh | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 76c7009..a404432 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.59"
-       DATE_="2010-11-23; last update: 2016-01-11"
+    VERSION_="1.60"
+       DATE_="2010-11-23; last update: 2016-01-12"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -2289,12 +2289,30 @@ sed -i "s^ClusterDomainName^$CLUSTERDOMAINNAME^g" $TMPOPENSRF_XML
 ### Continue LVS config.
 cat "$TEMPLATEDIR/lvs/ldirectord.cf-footer" >> "$LVSCONFIGFILE"
 cp -f "$LVSCONFIGFILE" $TMPFOLDER/ldirectord.conf
+cp -f "$LVSCONFIGFILE" $TMPFOLDER/ldirectord-webby
+
 sed -i "s^:80^:443^g" $TMPFOLDER/ldirectord.conf
 sed -i "s^http^https^" $TMPFOLDER/ldirectord.conf
+sed -i '/scheduler/i\\tchecktimeout=30' $TMPFOLDER/ldirectord.conf
+sed -i '/scheduler/i\\tchecktype=external' $TMPFOLDER/ldirectord.conf
+sed -i '/scheduler/i\\tcheckcommand="/usr/local/bin/check_https"' $TMPFOLDER/ldirectord.conf
 echo >> "$LVSCONFIGFILE"
 cat $TMPFOLDER/ldirectord.conf >> "$LVSCONFIGFILE"
+
+sed -i "s^:80^:7682^g" $TMPFOLDER/ldirectord-webby
+sed -i "s^http^https^" $TMPFOLDER/ldirectord-webby
+sed -i '/request/d' $TMPFOLDER/ldirectord-webby
+sed -i '/receive/d' $TMPFOLDER/ldirectord-webby
+sed -i '/service/d' $TMPFOLDER/ldirectord-webby
+sed -i '/fallback/d' $TMPFOLDER/ldirectord-webby
+sed -i '/scheduler/i\\tchecktype=connect' $TMPFOLDER/ldirectord-webby
+echo  >> "$LVSCONFIGFILE"
+cat $TMPFOLDER/ldirectord-webby >> "$LVSCONFIGFILE"
+
 sed -i "s^Priv_NET^$PRIVATENET^g" "$LVSCONFIGFILE"
 
+
+
 ### Complete LVS Director config.
 for LVS in $MACHINES_LVS_ONLY
 	do
-- 
2.11.0