Update EG install scripts for 3.3
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Tue, 14 May 2019 19:27:45 +0000 (12:27 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Tue, 14 May 2019 19:28:56 +0000 (12:28 -0700)
deployment/install-eg.sh
deployment/install-osrf.sh

index d4ad0a6..2339658 100755 (executable)
@@ -6,12 +6,11 @@ DEFAULT_USER="opensrf"
 INSTALL_USER="opensrf"
 BUILDDIR="/home/${INSTALL_USER}/evergreen"
 INSTALLDIR="/srv/openils"
-BRANCH="user/jeffdavis/eg317-tpac"
-STAMP_ID="rel_3_1_7"
-ALT_STAMP_IDS="3_1_7"
-VERSION="3.1.7.sitka.1"
+BRANCH="user/jeffdavis/eg33-tpac"
+STAMP_ID="rel_3_3_0"
+VERSION="3.3.0.sitka.1"
 SITKACONF="/home/${DEFAULT_USER}/sysadmin"
-SITKACONF_BRANCH="master"
+SITKACONF_BRANCH="eg33"
 SITKATOOLS="/root/sitka-tools"
 
 THISHOST=`hostname -s`
@@ -96,7 +95,7 @@ if [[ ! -n "$TARBALL" && ! -n "$SKIPWEBCLIENT" ]] ; then
     suwrap "npm run build-prod && npm run test" ${INSTALL_USER} || { echo 'Could not install files for AngularJS staff client' ; exit 1; }
     cd ${BUILDDIR}/Open-ILS/src/eg2/
     suwrap "npm install" ${INSTALL_USER}
-    suwrap "ng build --prod && npm run test" ${INSTALL_USER} || { echo 'Could not install files for Angular staff client' ; exit 1; }
+    suwrap "ng build && npm run test" ${INSTALL_USER} || { echo 'Could not install files for Angular staff client' ; exit 1; }
   fi
 fi
 
@@ -107,7 +106,7 @@ suwrap "cd ${BUILDDIR} && make" ${INSTALL_USER}
 suwrap "cd ${BUILDDIR}/build/i18n && make LOCALE=fr-CA install && make LOCALE=en-CA install" ${INSTALL_USER}
  
 # as root
-cd ${BUILDDIR} && make STAFF_CLIENT_VERSION=${VERSION} STAFF_CLIENT_STAMP_ID=${STAMP_ID} install
+cd ${BUILDDIR} && make install
 mv ${INSTALLDIR}/var/web/reports/fm_IDL.xml ${INSTALLDIR}/var/web/reports/fm_IDL.xml.orig && cp ${INSTALLDIR}/conf/fm_IDL.xml ${INSTALLDIR}/var/web/reports/
  
 # setup start page
@@ -273,34 +272,14 @@ if [ ! -f "/home/opensrf/dojo.tgz" ] ; then
 fi
 tar -C ${INSTALLDIR}/var/web/js/dojo/ -zxf /home/opensrf/dojo.tgz
  
-# 2. set up staff client
-cd ${INSTALLDIR}/var/web/xul && rm server && rm current
-cd ${INSTALLDIR}/var/web/xul && ln -s ${STAMP_ID} current && ln -s current/server server
-for ALT_STAMP_ID in ${ALT_STAMP_IDS}
-do
-  cd ${INSTALLDIR}/var/web/xul && ln -s current ${ALT_STAMP_ID}
-done
+# 2. set up XUL client - DEPRECATED
  
 # 3. install circ scripts and opac skins - DEPRECATED
 
 # 4a. avoid 404s
 touch ${INSTALLDIR}/var/web/css/skin/default/register_custom.css
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-CA/patron_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-CA/common_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-CA/offline_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-CA/auth_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-CA/cat_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-CA/circ_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-US/patron_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-US/common_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-US/offline_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-US/auth_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-US/cat_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/locale/en-US/circ_custom.properties
-touch ${INSTALLDIR}/var/web/xul/server/skin/custom.js
-
-# 4b. workaround for LP#1461683
-cd ${INSTALLDIR}/var/web/xul/server/locale/en-CA && mv multiclass_search_help.html multiclass_search_help.html.orig && ln -s ../en-US/multiclass_search_help.html
+
+# 4b. workaround for LP#1461683 - DEPRECATED
 
 # 5. locale hack - XXX deprecated?
 #cd ${INSTALLDIR}/var/web/opac/locale && cp -fdr en-US en-US-bak && cp -fdr en-CA en-US
@@ -313,7 +292,7 @@ if [[ ! -d "${INSTALLDIR}/var/web/deletepatron" ]] ; then
 fi
 cd ${INSTALLDIR}/var/web/deletepatron && git checkout eg22
 if [[ -n "$NEW_DELETEPATRON_INSTALL" ]] ; then
-  find ${INSTALLDIR}/var/web/deletepatron -name "*.pm" | xargs sed -i -e 's|/openils|/srv/openils|g'
+  find ${INSTALLDIR}/var/web/deletepatron -name "*.pm" | xargs sed -i -e "s|/openils|${INSTALLDIR}|g"
 fi
 apt-get install -y libcgi-session-perl libhtml-template-perl
 
index 85c0256..d063446 100755 (executable)
@@ -3,10 +3,10 @@ DEFAULT_USER="opensrf"
 HOMEDIR="/home/${DEFAULT_USER}"
 BUILDDIR="${HOMEDIR}/opensrf"
 INSTALLDIR="/srv/openils"
-BRANCH="user/berick/lp1777180-websocketd-gateway"
+BRANCH="rel_3_1"
 HOSTNAME="nonprod"
 SITKACONF="${HOMEDIR}/sysadmin"
-SITKACONF_BRANCH="master"
+SITKACONF_BRANCH="eg33"
 
 WEBSOCKETD_VERSION="0.3.0"
 WEBSOCKETD_ZIP="websocketd-${WEBSOCKETD_VERSION}-linux_amd64.zip"
@@ -142,11 +142,6 @@ echo "OpenSRF is installed!"
 # websockets install (REQUIRED for web client)
 # XXX a valid SSL cert is required!
 if [[ ! -n "$SKIP_WEBSOCKETS" ]] ; then
-  # remove apache-websocket stuff
-  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
-
-  # install websocketd
   [[ -e "/tmp/websocketd" ]] && rm /tmp/websocketd
   [[ ! -e "/tmp/${WEBSOCKETD_ZIP}" ]] && su -c "cd /tmp && wget '${WEBSOCKETD_URL}' && unzip ${WEBSOCKETD_ZIP}" ${DEFAULT_USER}
   cp /tmp/websocketd /usr/local/bin/