Revert "install-osrf.sh: testing fix for LP#1774703"
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Tue, 12 Jun 2018 18:27:15 +0000 (11:27 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Tue, 12 Jun 2018 18:27:15 +0000 (11:27 -0700)
This reverts commit 3f478e6839fe550a7ddb936b541cbda1b23533cc.

deployment/install-osrf.sh

index 988eeb3..f313c71 100755 (executable)
@@ -3,8 +3,7 @@ DEFAULT_USER="opensrf"
 HOMEDIR="/home/${DEFAULT_USER}"
 BUILDDIR="${HOMEDIR}/opensrf"
 INSTALLDIR="/srv/openils"
-#BRANCH="rel_3_0"
-BRANCH="user/berick/lp1774703-websocket-thread-lock"
+BRANCH="rel_3_0"
 HOSTNAME="nonprod"
 SITKACONF="${HOMEDIR}/sysadmin"
 SITKACONF_BRANCH="master"
@@ -56,7 +55,7 @@ then
 fi
 su -c "cd ${HOMEDIR}/sysadmin && git fetch origin && git checkout ${SITKACONF_BRANCH} && git pull" ${DEFAULT_USER}
 if [ ! -d "${BUILDDIR}/.git" ] ; then
-  su -c "cd ${HOMEDIR} && git clone git://git.evergreen-ils.org/working/OpenSRF.git opensrf" ${DEFAULT_USER}
+  su -c "cd ${HOMEDIR} && git clone git://git.evergreen-ils.org/OpenSRF.git opensrf" ${DEFAULT_USER}
 fi
 su -c "cd ${BUILDDIR} && git fetch origin && git checkout ${BRANCH} && git pull" ${DEFAULT_USER}
  
@@ -133,9 +132,7 @@ echo "OpenSRF is installed!"
 # XXX a valid SSL cert is required!
 if [[ ! -n "$SKIP_WEBSOCKETS" ]] ; then
   rm -r /tmp/apache-websocket
-  rm -r /etc/apache2-websockets /etc/init.d/apache2-websockets /usr/local/sbin/*-websockets /var/log/apache2-websockets/ /etc/logrotate.d/apache2-websockets
-  #cd /tmp && git clone https://github.com/disconnect/apache-websocket
-  cd /tmp && git clone https://github.com/jchampio/apache-websocket
+  cd /tmp && git clone https://github.com/disconnect/apache-websocket
   cd apache-websocket && apxs2 -i -a -c mod_websocket.c
   sh /usr/share/doc/apache2/examples/setup-instance websockets
   a2dismod websocket