trusty installer: apache_24, no browser node, etc. option

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/installer/trusty/eg_trusty_installer.sh b/installer/trusty/eg_trusty_installer.sh
index 7181350..b788002 100755 (executable)
--- a/installer/trusty/eg_trusty_installer.sh
+++ b/installer/trusty/eg_trusty_installer.sh
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 # -----------------------------------------------------------------------
 
-while getopts ayst option
+while getopts aystb option
 do
         case "${option}"
         in
@@ -22,6 +22,7 @@ do
                 y) YES=1;;
                 s) SAMPLEDATA=--load-all-sample;;
                 t) LIVETEST=1;;
+                b) NO_BROWSER=1;;
         esac
 done
 
@@ -363,6 +364,10 @@ function test_evergreen_build {
 # build process is not baked into Evergreen proper (yet).  
 # Run it as a standalone operation for now.
 function test_and_build_eg_browser_client {
+    if [ "$NO_BROWSER" == 1 ]; then
+        echo "_.-~= Skipping Evergreen browser client build/test"
+        return;
+    fi;
     echo _.-~= Running Evergreen browser client build/test
     cd /tmp
     git clone $NODEJS_REPO
@@ -470,9 +475,9 @@ function configure_apache {
     /etc/init.d/apache2 stop
     # Copy apache configs into place and create SSL cert
     cd /home/opensrf/Evergreen/
-    cp Open-ILS/examples/apache/eg.conf       /etc/apache2/sites-available/
-    cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
-    cp Open-ILS/examples/apache/eg_startup    /etc/apache2/
+    cp Open-ILS/examples/apache_24/eg.conf       /etc/apache2/sites-available/
+    cp Open-ILS/examples/apache_24/eg_vhost.conf /etc/apache2/
+    cp Open-ILS/examples/apache_24/eg_startup    /etc/apache2/
 
     mkdir -p /etc/apache2/ssl;
     if [ ! -f /etc/apache2/ssl/server.key ] ; then