X-Git-Url: https://git.sitka.bclibraries.ca/gitweb/?p=sitka%2Fsitka-tools.git;a=blobdiff_plain;f=deployment%2Finstall-eg.sh;h=480df17cfb6f0288c9ef63614516e74aba1c183b;hp=3c33bd6eba920b7c877d7acd9f4eb05c1f8bba9c;hb=24057702b1490c3dec456abb1eaa82ce17ddc1a4;hpb=4115cc36234cd6c816dbdab2db7e9a110d38deba

diff --git a/deployment/install-eg.sh b/deployment/install-eg.sh
index 3c33bd6..480df17 100755
--- a/deployment/install-eg.sh
+++ b/deployment/install-eg.sh
@@ -8,17 +8,31 @@ HOMEDIR="/home/${DEFAULT_USER}"
 #BUILDDIR="${HOMEDIR}/${EGRELEASE}"
 BUILDDIR="${HOMEDIR}/evergreen"
 INSTALLDIR="/srv/openils"
-BRANCH="upgrade/eg28/phase3-tpac"
+BRANCH="upgrade/eg28/final-tpac"
 STAMP_ID="rel_2_8_1"
 ALT_STAMP_IDS="2_8_1 rel_2_8_beta 2_8_beta rel_2_8_0 2_8_0"
 VERSION="2.8.1.sitka.0"
 SITKACONF="${HOMEDIR}/sysadmin"
+SITKACONF_BRANCH="eg28"
 SITKATOOLS="/root/sitka-tools"
 
 suwrap() {
-  su -s /bin/bash -l -c "source ~/.bashrc ; $1" $2
+  su -s /bin/bash -c "source ~/.bashrc ; $1" $2
 }
 
+while getopts ":p" opt ; do
+  case $opt in
+    p ) PROD="prod";;
+  esac
+done
+shift $(($OPTIND - 1))
+
+if [[ -n "$PROD" ]] ; then
+  echo 'this is a production install'
+else
+  echo 'this is NOT a production install'
+fi
+
 # as DEFAULT_USER
 
 # grab Sitka config files
@@ -27,7 +41,7 @@ then
   # this will fail unless DEFAULT_USER has read access to the repo
   suwrap "cd ${HOMEDIR} && git clone git+ssh://git@git.sitka.bclibraries.ca/sitka-infra/sysadmin" ${DEFAULT_USER}
 fi
-suwrap "cd ${SITKACONF} && git pull" ${DEFAULT_USER}
+suwrap "cd ${SITKACONF} && git fetch origin && git checkout ${SITKACONF_BRANCH} && git pull" ${DEFAULT_USER}
 
 # checkout EG source
 if [ ! -d "${BUILDDIR}" ]
@@ -57,7 +71,7 @@ mv ${INSTALLDIR}/var/web/reports/fm_IDL.xml ${INSTALLDIR}/var/web/reports/fm_IDL
 chown -R opensrf:opensrf ${INSTALLDIR}
  
 # Apache stuff (as root):
-APACHEFILES="/etc/apache2/eg_vhost.conf /etc/apache2/eg_startup /etc/apache2/sites-available/eg.conf"
+APACHEFILES="/etc/apache2/eg_vhost.conf /etc/apache2/eg_startup /etc/apache2/sites-available/eg.conf /etc/apache2/envvars"
 for APACHEFILE in ${APACHEFILES}
 do
   mv ${APACHEFILE} ${APACHEFILE}.bak
@@ -87,9 +101,9 @@ do
   mv ${OSRFCONFFILE} ${OSRFCONFFILE}.bak
   cp ${SITKACONF}/files/${OSRFCONFFILE}/${HOSTNAME} ${OSRFCONFFILE}
 done
-if [ ! -f "${HOMEDIR}/.srfsh.xml" ]
+if [ ! -f "/home/opensrf/.srfsh.xml" ]
 then
-  cp ${SITKACONF}/files/home/opensrf/.srfsh.xml/${HOSTNAME} ${HOMEDIR}/.srfsh.xml
+  cp ${SITKACONF}/files/home/opensrf/.srfsh.xml/${HOSTNAME} /home/opensrf/.srfsh.xml
 fi 
 
 # 1. install dojo
@@ -147,7 +161,11 @@ if [ ! -d "${INSTALLDIR}/var/web/news" ]
 then
   mkdir ${INSTALLDIR}/var/web/news
 fi
-NEWSFILES="index.html style.css"
+if [ ! -d "${INSTALLDIR}/var/web/news/media" ]
+then
+  mkdir ${INSTALLDIR}/var/web/news/media
+fi
+NEWSFILES="index.html style.css media/logo.png media/book.png media/policy.png media/dash.png media/delete.png"
 for NEWSFILE in ${NEWSFILES}
 do
   if [ -f "${SITKACONF}/files/${INSTALLDIR}/var/web/news/${NEWSFILE}/${HOSTNAME}" ]
@@ -155,12 +173,23 @@ do
     cp ${SITKACONF}/files/${INSTALLDIR}/var/web/news/${NEWSFILE}/${HOSTNAME} ${INSTALLDIR}/var/web/news/${NEWSFILE}
   fi
 done
+if [[ -n "$PROD" ]] ; then
+  if [ ! -e "${INSTALLDIR}/var/web/news/wikipull.pl" ] ; then cp ${SITKACONF}/files/${INSTALLDIR}/var/web/news/wikipull.pl/${HOSTNAME} ${INSTALLDIR}/var/web/news/wikipull.pl ; fi
+  if [ ! -e "/etc/cron.d/news" ] ; then cp ${SITKACONF}/files/etc/cron.d/news/${HOSTNAME} /etc/cron.d/news ; fi
+fi
 
 # 8.5 offline patron list
-if [ ! -d "${INSTALLDIR}/var/data/offline/blocked" ] ; then mkdir -p ${INSTALLDIR}/var/data/offline/blocked ; fi
-if [ ! -e "${INSTALLDIR}/var/web/standalone/list.txt" ] ; then ln -s ${INSTALLDIR}/var/data/offline/blocked/patron-block-list.txt list.txt ; fi
+if [ ! -d "${INSTALLDIR}/var/data/offline/blocked" ] ; then 
+  # TODO: handle prod - an NFS share should exist
+  if [[ ! -n "$PROD" ]] ; then
+    mkdir -p ${INSTALLDIR}/var/data/offline/blocked
+  fi
+fi
+if [ ! -e "${INSTALLDIR}/var/web/standalone/list.txt" ] ; then ln -s ${INSTALLDIR}/var/data/offline/blocked/patron-block-list.txt ${INSTALLDIR}/var/web/standalone/list.txt ; fi
 if [ ! -e "${INSTALLDIR}/bin/update-offline-blocked-list.sh" ] ; then cp ${SITKATOOLS}/maintenance/update-offline-blocked-list.sh ${INSTALLDIR}/bin/update-offline-blocked-list.sh ; fi
 
+cp ${SITKACONF}/files${INSTALLDIR}/var/data/zips.txt/${HOSTNAME} ${INSTALLDIR}/var/data/zips.txt
+
 # 9. make sure opensrf owns all the stuff we just did
 chown -R opensrf:opensrf ${INSTALLDIR}
 chown -R opensrf:opensrf /home/opensrf