install-osrf.sh: testing fix for LP#1774703

[sitka/sitka-tools.git] / deployment / install-osrf.sh

diff --git a/deployment/install-osrf.sh b/deployment/install-osrf.sh
index 8ec185f..988eeb3 100755 (executable)
--- a/deployment/install-osrf.sh
+++ b/deployment/install-osrf.sh
@@ -1,29 +1,46 @@
 #!/bin/bash
-DEFAULT_USER="sitkastaff"
+DEFAULT_USER="opensrf"
 HOMEDIR="/home/${DEFAULT_USER}"
 BUILDDIR="${HOMEDIR}/opensrf"
 INSTALLDIR="/srv/openils"
-BRANCH="rel_2_4"
+#BRANCH="rel_3_0"
+BRANCH="user/berick/lp1774703-websocket-thread-lock"
 HOSTNAME="nonprod"
 SITKACONF="${HOMEDIR}/sysadmin"
-SITKACONF_BRANCH="eg210"
+SITKACONF_BRANCH="master"
 
-# test for ejabberd passwords
-if [ -z "$PRIVATE_ROUTER_PASSWD" -o -z "$PRIVATE_OPENSRF_PASSWD" -o -z "$PUBLIC_ROUTER_PASSWD" -o -z "$PUBLIC_OPENSRF_PASSWD" ]
-then
-  echo "Missing ejabberd password(s), no OpenSRF install!"
-  exit
-fi
+THISHOST=`hostname -s`
 
-while getopts ":p" opt ; do
+while getopts ":pWj" opt ; do
   case $opt in
     p ) PROD="prod";;
+    W ) SKIP_WEBSOCKETS="websockets";;
+    j ) SKIP_EJABBERD_REG="skip_ejabberd_reg";;
   esac
 done
 shift $(($OPTIND - 1))
 
+# test for ejabberd passwords
+if [ -z "$PRIVATE_ROUTER_PASSWD" -o -z "$PRIVATE_OPENSRF_PASSWD" -o -z "$PUBLIC_ROUTER_PASSWD" -o -z "$PUBLIC_OPENSRF_PASSWD" ]
+then
+  if [[ ! -n "$SKIP_EJABBERD_REG" ]] ; then
+    echo "Missing ejabberd password(s), no OpenSRF install!"
+    exit
+  fi
+fi
+
+# always use a proxy for websockets traffic
+if [[ ! -n "$SKIP_WEBSOCKETS" ]] ; then
+    WSPORT="--with-websockets-port=443"
+    # load-balanced installs require mod_rpaf - see LP#1684970
+    apt-get install libapache2-mod-rpaf
+else
+    WSPORT=""
+fi
+
 if [[ -n "$PROD" ]] ; then
   echo 'this is a production install'
+  [ "$HOSTNAME" == "nonprod" ] && HOSTNAME="prod"
 else
   echo 'this is NOT a production install'
 fi
@@ -39,7 +56,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/OpenSRF.git opensrf" ${DEFAULT_USER}
+  su -c "cd ${HOMEDIR} && git clone git://git.evergreen-ils.org/working/OpenSRF.git opensrf" ${DEFAULT_USER}
 fi
 su -c "cd ${BUILDDIR} && git fetch origin && git checkout ${BRANCH} && git pull" ${DEFAULT_USER}
  
@@ -59,7 +76,7 @@ cd ${BUILDDIR} && make -f src/extras/Makefile.install ubuntu-trusty
 # as DEFAULT_USER
 echo "Configuring and building OpenSRF..."
 su -c "cd ${BUILDDIR} && autoreconf -i" ${DEFAULT_USER}
-su -c "cd ${BUILDDIR} && ./configure --prefix=${INSTALLDIR} --sysconfdir=${INSTALLDIR}/conf" ${DEFAULT_USER}
+su -c "cd ${BUILDDIR} && ./configure --prefix=${INSTALLDIR} --sysconfdir=${INSTALLDIR}/conf ${WSPORT}" ${DEFAULT_USER}
 su -c "cd ${BUILDDIR} && make" ${DEFAULT_USER}
  
 # as root
@@ -73,7 +90,9 @@ for PATHFILE in ${PATHFILES} ; do
   fi
 done
 chown ${DEFAULT_USER}:${DEFAULT_USER} /home/${DEFAULT_USER}/.bashrc
-chown -R opensrf:opensrf ${INSTALLDIR}
+if [[ ! -n "$PROD" ]] ; then
+  chown -R opensrf:opensrf ${INSTALLDIR}
+fi
  
 # as root, add the following two lines to /etc/hosts:
 #127.0.1.2     public.localhost        public
@@ -99,25 +118,32 @@ cp ${SITKACONF}/files/etc/ejabberd/ejabberd.cfg/${HOSTNAME} /etc/ejabberd/ejabbe
 sed -i "s|__HOSTNAME__|${THISHOST}|g" /etc/ejabberd/ejabberd.cfg
 chgrp ejabberd /etc/ejabberd/ejabberd.cfg
 chmod 640 /etc/ejabberd/ejabberd.cfg
-/etc/init.d/ejabberd restart && sleep 10 && \
+/etc/init.d/ejabberd stop && /etc/init.d/ejabberd start
+if [[ ! -n "$SKIP_EJABBERD_REG" ]] ; then
+  sleep 5
   ejabberdctl register router private.localhost ${PRIVATE_ROUTER_PASSWD} && \
   ejabberdctl register opensrf private.localhost ${PRIVATE_OPENSRF_PASSWD} && \
   ejabberdctl register router public.localhost ${PUBLIC_ROUTER_PASSWD} && \
   ejabberdctl register opensrf public.localhost ${PUBLIC_OPENSRF_PASSWD}
+fi
 
 echo "OpenSRF is installed!"
 
 # websockets install (REQUIRED for web client)
 # XXX a valid SSL cert is required!
-#rm -r /tmp/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
-#cp ${SITKACONF}/files/etc/apache2-websockets/apache2.conf/${HOSTNAME} /etc/apache2-websockets/apache2.conf
-#cp ${SITKACONF}/files/etc/apache2-websockets/envvars/${HOSTNAME} /etc/apache2-websockets/envvars
+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 apache-websocket && apxs2 -i -a -c mod_websocket.c
+  sh /usr/share/doc/apache2/examples/setup-instance websockets
+  a2dismod websocket
+  cp ${SITKACONF}/files/etc/apache2-websockets/apache2.conf/${HOSTNAME} /etc/apache2-websockets/apache2.conf
+  sed -i "s|__THISHOST__|${THISHOST}|g" /etc/apache2-websockets/apache2.conf
+  cp ${SITKACONF}/files/etc/apache2-websockets/envvars/${HOSTNAME} /etc/apache2-websockets/envvars
 
-#/etc/init.d/apache2-websockets start
-
-#echo "websockets is installed!"
+  #/etc/init.d/apache2-websockets start
 
+  #echo "websockets is installed!"
+fi