From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 11 Apr 2012 15:49:05 +0000 (+0000)
Subject: Check for apache binary after apache installation.
X-Git-Tag: glite-px-proxyrenewal_R_1_3_25_2~14
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8b50f4ca409f967d43ae5f91ba4f81e52ba0d258;p=jra1mw.git

Check for apache binary after apache installation.
---

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
index a4df1c2..282e4f7 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -47,6 +47,12 @@ export GSTSTCOLS
 
 ${INSTALLCMD} voms-clients curl wget lsof $INSTALLPKGS
 
+if test -f /usr/sbin/apache2; then
+	SYS_APACHE=apache2
+else
+	SYS_APACHE=httpd
+fi
+
 if [ -d /etc/apache2 -a ! -d /etc/apache2/modules ]; then
 	ln -s ../../var/log/apache2 /etc/apache2/logs
 	ln -s ../../usr/lib/apache2/modules /etc/apache2/modules
@@ -98,8 +104,8 @@ mkdir -p /var/www/htdocs
 killall httpd apache2 >/dev/null 2>&1
 sleep 2
 killall -9 httpd apache2 >/dev/null 2>&1
-echo Starting $SYS_APACHE -f \$HTTPD_CONF
-$SYS_APACHE -f \$HTTPD_CONF
+echo Starting \$SYS_APACHE -f \$HTTPD_CONF
+\$SYS_APACHE -f \$HTTPD_CONF
 
 cd /tmp