From: Jeff Davis <jdavis@sitka.bclibraries.ca>
Date: Wed, 22 Apr 2015 22:27:29 +0000 (-0700)
Subject: install-osrf.sh: need placeholder apache2.conf before installing prereqs
X-Git-Url: https://git.sitka.bclibraries.ca/gitweb/?p=sitka%2Fsitka-tools.git;a=commitdiff_plain;h=15e3aada3cd0886869a8b0692eb49c9c52ebd556

install-osrf.sh: need placeholder apache2.conf before installing prereqs
---

diff --git a/deployment/install-osrf.sh b/deployment/install-osrf.sh
index 61e4cf2..9cf8261 100755
--- a/deployment/install-osrf.sh
+++ b/deployment/install-osrf.sh
@@ -31,6 +31,14 @@ fi
 su -l -c "cd ${BUILDDIR} && git fetch origin && git checkout ${BRANCH} && git pull" ${DEFAULT_USER}
  
 # as root
+echo "need a placeholder apache2.conf, installing from config repo..."
+if [ -f '/etc/apache2/apache2.conf' ]
+then
+  mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.bak
+fi
+cp ${SITKACONF}/files/etc/apache2/apache2.conf/${HOSTNAME} /etc/apache2/apache2.conf
+
+# as root
 echo "Installing OpenSRF prerequisites for Ubuntu..."
 cd ${BUILDDIR} && make -f src/extras/Makefile.install ubuntu-trusty