From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 10 Feb 2012 16:45:58 +0000 (+0000)
Subject: Checking for apache config directory after it is installed.
X-Git-Tag: gridsite-core_R_1_7_17~114
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=01d7e188f1dacfd10a7be9432d0c36e47cdcc2c0;p=jra1mw.git

Checking for apache config directory after it is installed.
---

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 0639a0a..bb3977c 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -21,15 +21,6 @@ function gen_arrange_script_gridsite()
 remotehost=$1
 COPYPROXY=$2
 
-HTTPD_CONFDIR=/tmp
-for dir in /etc/httpd /etc/apache /etc/apache2; do
-	if [ -d $dir ]; then
-		HTTPD_CONFDIR=$dir
-		break
-	fi
-done
-HTTPD_CONF=$HTTPD_CONFDIR/gridsite-webserver.conf
-
 egrep -i "Debian|Ubuntu" /etc/issue
 if [ \$? = 0 ]; then 
         INSTALLCMD="apt-get install -q --yes"
@@ -53,6 +44,15 @@ export GSTSTCOLS
 ${INSTALLCMD} voms-clients httpd mod_ssl curl wget nc lsof
 
 
+HTTPD_CONFDIR=/tmp
+for dir in /etc/httpd /etc/apache /etc/apache2; do
+	if [ -d $dir ]; then
+		HTTPD_CONFDIR=$dir
+		break
+	fi
+done
+HTTPD_CONF=$HTTPD_CONFDIR/gridsite-webserver.conf
+
 sed -e '1,\$s!/usr/lib/httpd/modules/!modules/!' /usr/share/doc/gridsite-*/httpd-webserver.conf | sed 's!/var/www/html!/var/www/htdocs!' | sed "s/FULL.SERVER.NAME/\$(hostname -f)/" | sed "s/\(GridSiteGSIProxyLimit\)/# \1/"> $HTTPD_CONF
 echo "AddHandler cgi-script .cgi" >> $HTTPD_CONF
 echo "ScriptAlias /gridsite-delegation.cgi /usr/sbin/gridsite-delegation.cgi" >> $HTTPD_CONF