From f4a452a847c5ab70157cce5d224faa6ad985cd68 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 19 Oct 2012 11:35:44 -0400
Subject: [PATCH] Disable configuration of Apache during startup and shutdown
since this is no longer a prerequisite for running unit tests, and it seems
to be causing problems on the live CI server.
---
build.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index d645e898565..36256914183 100644
--- a/build.xml
+++ b/build.xml
@@ -74,10 +74,13 @@
<!-- set up appropriate read/write permissions for Apache -->
<exec command="chmod -R a+w ${srcdir}/local/cache" />
- <!-- activate Apache -->
+ <!-- Generate basic configuration -->
<exec command="php ${srcdir}/install.php --use-defaults" />
+
+ <!-- Activate Apache (currently disabled; not necessary unless we start using Selenium again)
<copy file="${srcdir}/local/httpd-vufind.conf" tofile="${apacheconfdir}/vufindtest" />
<exec command="${apachectl} restart" />
+ -->
<!-- build and configure the requested database type -->
<if>
@@ -120,9 +123,10 @@
<!-- Uninstall and Deactivate VuFind -->
<target name="shutdown" description="deactivate and uninstall demo">
- <!-- remove Apache settings -->
+ <!-- Remove Apache settings (disabled until corresponding lines in startup are also uncommented)
<exec command="rm ${apacheconfdir}/vufindtest" />
<exec command="${apachectl} restart" />
+ -->
<!-- drop database -->
<if>
--
GitLab