Update install scripts for EG 2.4.0 and OpenSRF 2.2.0

diff --git a/deployment/install-eg.sh b/deployment/install-eg.sh
index 5f9433b..a2fa611 100755 (executable)
--- a/deployment/install-eg.sh
+++ b/deployment/install-eg.sh
@@ -6,14 +6,15 @@ DEFAULT_USER="sitkastaff"
 HOMEDIR="/home/${DEFAULT_USER}"
 BUILDDIR="${HOMEDIR}/evergreen"
 INSTALLDIR="/srv/openils"
-BRANCH="production/sitka_2_2"
-VERSION="2.2.5.sitka.0"
-STAMP_ID="2_2_5_sitka_0"
-ALT_STAMP_IDS="rel_2_2_5_sitka_0 2_2_5_sitka_0 rel_2_2_5_sitka_0"
+BRANCH="user/jeffdavis/sitka-24-beta1"
+VERSION="2.4.0.sitka.0"
+STAMP_ID="2_4_0_sitka_0"
+ALT_STAMP_IDS="rel_2_4_0_sitka_0 2_4_0_sitka_0 rel_2_4_0_sitka_0"
 SITKACONF="${HOMEDIR}/sysadmin"
 DEPLOYDIR="/home/opensrf/deploy"
 OPACSKIN="${DEPLOYDIR}/opacskin"
 OILSPOLICY="${DEPLOYDIR}/oilspolicy"
+TPACS="${DEPLOYDIR}/deploykit"
 
 # as DEFAULT_USER
 
@@ -38,7 +39,7 @@ cd ${BUILDDIR} && make -f Open-ILS/src/extras/Makefile.install ubuntu-precise
  
 # as DEFAULT_USER
 su -l -c "cd ${BUILDDIR} && autoreconf -i" ${DEFAULT_USER}
-su -l -c "cd ${BUILDDIR} && ./configure -C --prefix='${INSTALLDIR}' --sysconfdir='\${prefix}/conf' --with-opensrf-headers=${INSTALLDIR}/include/ --with-opensrf-libs=${INSTALLDIR}/lib/ --with-dbi=/usr/lib/dbd/" ${DEFAULT_USER}
+su -s /bin/bash -l -c "cd ${BUILDDIR} && ./configure -C --prefix=${INSTALLDIR} --sysconfdir=${INSTALLDIR}/conf --with-opensrf-headers=${INSTALLDIR}/include/ --with-opensrf-libs=${INSTALLDIR}/lib/ --with-dbi=/usr/lib/dbd/" ${DEFAULT_USER}
 su -l -c "cd ${BUILDDIR} && make" ${DEFAULT_USER}
 su -l -c "cd ${BUILDDIR}/build/i18n && make install_all_locales" ${DEFAULT_USER}
  
@@ -100,7 +101,27 @@ cd ${OPACSKIN} && git checkout -b bclibraries && \
   rsync -a --exclude=.git ${OPACSKIN} ${INSTALLDIR}/var/web/opac/skin/bclibraries && \
   ln -s ${INSTALLDIR}/var/web/opac/skin/bclibraries ${INSTALLDIR}/var/web/opac/skin/default
 
-# (b) circ scripts
+# (c) TPAC stuff
+apt-get install rake erubis ruby-git
+if [ ! -d "${TPACS}" ]; then
+  cd ${DEPLOYDIR} && git clone git://git.sitka.bclibraries.ca/sitka/deploykit.git
+fi
+cd ${TPACS} && git pull
+cd ${TPACS}/deploykit && mv config.yml.sample config.yml
+if [ ! -d "/etc/apache2/includes" ]; then
+  mkdir /etc/apache2/includes
+fi
+if [ ! -d "/srv/openils/var/skins" ]; then
+  mkdir /srv/openils/var/skins
+fi
+# TODO: use rake to build AND deploy properly!
+#cd ${TPACS}/deploykit && rake tpac:all && \
+#  for TPACSKIN in `ls -1 ${TPACS}/deploykit/build`; do mkdir -p /srv/openils/var/skins/${TPACSKIN}/opac && \
+#    cp -r build/${TPACSKIN}/templates/opac/* /srv/openils/var/skins/${TPACSKIN}/opac/ && \
+#    cp ${TPACS}/build/${TPACSKIN}/apache2/${TPACSKIN}.conf /etc/apache2/sites-available/ && \
+#    cp ${TPACS}/build/${TPACSKIN}/apache2/${TPACSKIN}.conf-include /etc/apache2/includes/ ; done
+
+# (d) circ scripts
 if [ ! -d "${OILSPOLICY}" ]
 then
   cd ${DEPLOYDIR} && git clone git://git.sitka.bclibraries.ca/sitka/oilspolicy.git
@@ -152,4 +173,8 @@ done
 
 # 9. make sure opensrf owns all the stuff we just did
 chown -R opensrf:opensrf ${INSTALLDIR}
+chown -R opensrf:opensrf /home/opensrf
+chown -R opensrf:opensrf /var/lock/apache2
 
+# 10. staff client stuff
+apt-get install nsis unzip

diff --git a/deployment/install-osrf.sh b/deployment/install-osrf.sh
index 1daac3a..e59ecd6 100755 (executable)
--- a/deployment/install-osrf.sh
+++ b/deployment/install-osrf.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-OSRF="opensrf-2.1.2"
+OSRF="opensrf-2.2.0"
 INSTALLDIR="/srv/openils"
 HOSTNAME="nonprod"
 DEFAULT_USER="sitkastaff"