EG install scripts: more tweaks
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 24 Jun 2015 21:49:40 +0000 (14:49 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 24 Jun 2015 21:49:40 +0000 (14:49 -0700)
deployment/install-eg.sh
deployment/install-osrf.sh

index 0f651cc..b867618 100755 (executable)
@@ -58,7 +58,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
@@ -88,9 +88,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
@@ -162,6 +162,8 @@ if [ ! -d "${INSTALLDIR}/var/data/offline/blocked" ] ; then mkdir -p ${INSTALLDI
 if [ ! -e "${INSTALLDIR}/var/web/standalone/list.txt" ] ; then ln -s ${INSTALLDIR}/var/data/offline/blocked/patron-block-list.txt 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 ${SITACONF}/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
index 66d1fe8..9dce10e 100755 (executable)
@@ -53,7 +53,7 @@ su -c "cd ${BUILDDIR} && make" ${DEFAULT_USER}
 echo "Installing OpenSRF..."
 cd ${BUILDDIR} && make install
 useradd -m -s /bin/bash opensrf
-PATHFILES="/etc/profile /home/opensrf/.bashrc"
+PATHFILES="/etc/profile /root/.bashrc /home/opensrf/.bashrc"
 for PATHFILE in ${PATHFILES} ; do
   if [[ -e "${PATHFILE}" && ! `egrep "PATH=.*${INSTALLDIR}/bin" "${PATHFILE}"` ]] ; then 
     echo "export PATH=${INSTALLDIR}/bin:\$PATH" >> ${PATHFILE}