updated install scripts for production 2.4 environment

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

diff --git a/deployment/install-osrf.sh b/deployment/install-osrf.sh
index 818e50e..94b4444 100755 (executable)
--- a/deployment/install-osrf.sh
+++ b/deployment/install-osrf.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
-OSRF="opensrf-2.1.0"
+OSRF="opensrf-2.2.0"
 INSTALLDIR="/srv/openils"
+HOSTNAME="nonprod-24"
 DEFAULT_USER="sitkastaff"
 HOMEDIR="/home/${DEFAULT_USER}"
 SITKACONF="${HOMEDIR}/sysadmin"
@@ -23,7 +24,9 @@ then
   su -l -c "cd ${HOMEDIR} && git clone git+ssh://git@git.sitka.bclibraries.ca/sitka-infra/sysadmin" ${DEFAULT_USER}
 fi
 su -l -c "cd ${HOMEDIR}/sysadmin && git pull" ${DEFAULT_USER}
-su -l -c "cd ${HOMEDIR} && wget http://open-ils.org/downloads/${OSRF}.tar.gz && tar xzf ${OSRF}.tar.gz" ${DEFAULT_USER}
+if [ ! -d "${HOMEDIR}/${OSRF}" ] ; then
+  su -l -c "cd ${HOMEDIR} && wget http://open-ils.org/downloads/${OSRF}.tar.gz && tar xzf ${OSRF}.tar.gz" ${DEFAULT_USER}
+fi
  
 # as root
 echo "Installing OpenSRF prerequisites for Ubuntu..."
@@ -56,13 +59,13 @@ ldconfig
  
 # as root
 echo "Setting up ejabberd..."
-mv /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberd.cfg.orig && cp ${SITKACONF}/files/etc/ejabberd/ejabberd.cfg/nonprod /etc/ejabberd/
+cp ${SITKACONF}/files/etc/ejabberd/ejabberd.cfg/${HOSTNAME} /etc/ejabberd/ejabberd.cfg
 chgrp ejabberd /etc/ejabberd/ejabberd.cfg
 chmod 640 /etc/ejabberd/ejabberd.cfg
-/etc/init.d/ejabberd restart
-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
+/etc/init.d/ejabberd restart && sleep 10 && \
+  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}
 
 echo "OpenSRF is installed!"