From 8b50f4ca409f967d43ae5f91ba4f81e52ba0d258 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 11 Apr 2012 15:49:05 +0000 Subject: [PATCH] Check for apache binary after apache installation. --- .../gridsite/tests/gridsite-common-testbeds.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 -- 1.8.2.3