From: Andy Witter <awitter@georgialibraries.org>
Date: Tue, 21 May 2013 22:56:39 +0000 (-0400)
Subject: remove eg_config from templates to use integrated on in the deb.  Also add memcache... 
X-Git-Tag: GenaSYS-2.4.0~8
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2bfa5db7207055c2f15c2633910462e7d0b987ab;p=contrib%2Fpines%2Fgenasys.git

remove eg_config from templates to use integrated on in the deb.  Also add memcache to installation order
---

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 2f35c7f..4028283 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.09"
-       DATE_="2010-09-18; last update: 2013-05-16"
+    VERSION_="1.10"
+       DATE_="2010-09-18; last update: 2013-05-21"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -1467,7 +1467,7 @@ for BRICK in $(seq $BRICKCOUNT)
         eval cp -f $TEMPLATEDIR/apache2/eg.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/sites-available
         #eval cp -f $TEMPLATEDIR/apache2/eg_vhost.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
 	eval cp -f $TEMPLATEDIR/apache2/apache2.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
-	eval cp -f $TEMPLATEDIR/apache2/eg_startup ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
+	#eval cp -f $TEMPLATEDIR/apache2/eg_startup ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
         eval cd ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/sites-enabled && ln -s ../sites-available/eg.conf . && \
         cd $WD
         eval cp -f $TEMPLATEDIR/interfaces ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/network
@@ -1584,7 +1584,7 @@ for BRICK in $(seq $BRICKCOUNT)
 	eval cp -f $TEMPLATEDIR/apache2/eg.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/sites-available
 	#eval cp -f $TEMPLATEDIR/apache2/eg_vhost.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
 	eval cp -f $TEMPLATEDIR/apache2/apache2.conf ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
-	eval cp -f $TEMPLATEDIR/apache2/eg_startup ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
+	#eval cp -f $TEMPLATEDIR/apache2/eg_startup ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2
 	eval cd ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/sites-enabled && ln -s ../sites-available/eg.conf . && \
 	cd $WD
 	eval cp -f $TEMPLATEDIR/interfaces ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/network
@@ -2574,9 +2574,9 @@ echo -e "Install in the order listed below."
 echo 
 if echo $REPORTS_NFS_HOSTNAME | grep -q reporter
 	then
-	echo -e $COL_BR_GREEN" lvs logger backup reporter db brick01-head other-bricks sip utility monitor" $COL_RESET
+	echo -e $COL_BR_GREEN" lvs logger backup reporter db memcache brick01-head other-bricks sip utility monitor" $COL_RESET
 		else
-		echo -e $COL_BR_GREEN" lvs logger backup $REPORTS_NFS_HOSTNAME db brick01-head other-bricks reporter sip utility monitor" $COL_RESET
+		echo -e $COL_BR_GREEN" lvs logger backup $REPORTS_NFS_HOSTNAME db memcache brick01-head other-bricks reporter sip utility monitor" $COL_RESET
 fi
 echo 
 echo -e $COL_BR_YELLOW"_________________________________________________________________________"$COL_RESET