X-Git-Url: https://git.sitka.bclibraries.ca/gitweb/?p=sitka%2Fsitka-tools.git;a=blobdiff_plain;f=deployment%2Finstall-eg.sh;h=39ea0cc497f53c527a1b5e01bd0273af045d119f;hp=7b443cf047a2daaec38e86679cba854e95462316;hb=9d46f12d561e92c8c5d5d8fe018f692e14278fcd;hpb=edb3ea19e39a37bc86382b3e889c61f29ed6b11d

diff --git a/deployment/install-eg.sh b/deployment/install-eg.sh
index 7b443cf..39ea0cc 100755
--- a/deployment/install-eg.sh
+++ b/deployment/install-eg.sh
@@ -6,15 +6,11 @@ DEFAULT_USER="sitkastaff"
 HOMEDIR="/home/${DEFAULT_USER}"
 BUILDDIR="${HOMEDIR}/evergreen"
 INSTALLDIR="/srv/openils"
-BRANCH="user/jeffdavis/sitka-24-beta1"
+BRANCH="production/sitka_2_4"
 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"
 
 suwrap() {
   su -s /bin/bash -l -c "source ~/.bashrc ; $1" $2
@@ -52,13 +48,13 @@ cd ${BUILDDIR} && make STAFF_CLIENT_STAMP_ID=${STAMP_ID} STAFF_CLIENT_VERSION=${
 chown -R opensrf:opensrf ${INSTALLDIR}
  
 # Apache stuff (as root):
-APACHEFILES="/etc/apache2/eg_vhost.conf /etc/apache2/eg_startup /etc/apache2/sites-available/000-evergreen.conf"
+APACHEFILES="/etc/apache2/eg_vhost.conf /etc/apache2/eg_startup /etc/apache2/sites-available/eg.conf"
 for APACHEFILE in ${APACHEFILES}
 do
   cp ${SITKACONF}/files/${APACHEFILE}/${HOSTNAME} ${APACHEFILE}
 done
 a2dissite default
-a2ensite 000-evergreen.conf
+a2ensite eg.conf
 mkdir /etc/apache2/ssl
 cd /etc/apache2/ssl && openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
 
@@ -75,64 +71,25 @@ do
   rm ${OSRFCONFFILE}
   cp ${SITKACONF}/files/${OSRFCONFFILE}/${HOSTNAME} ${OSRFCONFFILE}
 done
-cp ${SITKACONF}/files/home/opensrf/.srfsh.xml/${HOSTNAME} ${HOMEDIR}/.srfsh.xml
- 
+if [ ! -d "${HOMEDIR}/.srfsh.xml" ]
+then
+  cp ${SITKACONF}/files/home/opensrf/.srfsh.xml/${HOSTNAME} ${HOMEDIR}/.srfsh.xml
+fi 
+
 # 1. install dojo
 cd /home/opensrf && wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
 tar -C ${INSTALLDIR}/var/web/js -xzf /home/opensrf/dojo-release-1.3.3.tar.gz
 cp -r ${INSTALLDIR}/var/web/js/dojo-release-1.3.3/* ${INSTALLDIR}/var/web/js/dojo/.
  
 # 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
  
-# 3. install circ scripts and opac skins
-
-# (a) setup deploy directory
-if [ ! -d "${DEPLOYDIR}" ]
-then
-  mkdir ${DEPLOYDIR}
-fi
-
-# (b) bclibraries skin
-if [ ! -d "${OPACSKIN}" ]
-then
-  cd ${DEPLOYDIR} && git clone git://git.sitka.bclibraries.ca/sitka/opacskin.git
-fi
-cd ${OPACSKIN} && git checkout -b bclibraries && \
-  cd ${INSTALLDIR}/var/web/opac/skin && mv default orig-default && \
-  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
-
-# (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
-fi
-cd ${OILSPOLICY} && git pull && rsync -a --exclude=.git ${OILSPOLICY} ${INSTALLDIR}/var
+# 3. install circ scripts and opac skins - DEPRECATED
  
 # 4. avoid 404s
 touch ${INSTALLDIR}/var/web/css/skin/default/register_custom.css