From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 10 Apr 2012 21:46:04 +0000 (+0000)
Subject: Debian updates (although we probably don't have mod_ssl on Debian).
X-Git-Tag: glite-px-proxyrenewal_R_1_3_25_2~26
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=fee4d50fb706ec2e97369cb53846c59b35b99567;p=jra1mw.git

Debian updates (although we probably don't have mod_ssl on Debian).
---

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
index 44eb0ad..a60d536 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
@@ -40,7 +40,7 @@ EndHelpHeader
 STARTTIME=`date +%s`
 
 egrep -i "Debian|Ubuntu" /etc/issue
-if [ \$? = 0 ]; then
+if [ $? = 0 ]; then
         INSTALLCMD="apt-get install -q --yes"
         INSTALLPKGS="lintian"
 	UPGRADECMD="apt-get upgrade"
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 6a2b17b..22e456e 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -24,10 +24,10 @@ COPYPROXY=$2
 egrep -i "Debian|Ubuntu" /etc/issue
 if [ \$? = 0 ]; then 
         INSTALLCMD="apt-get install -q --yes"
-	INSTALLPKGS="lintian"
+	INSTALLPKGS="lintian apache2-mpm-prefork netcat-traditional libapache2-mod-ssl"
 else
         INSTALLCMD="yum install -q -y --nogpgcheck"
-	INSTALLPKGS="rpmlint"
+	INSTALLPKGS="rpmlint httpd nc mod_ssl"
 fi
 
 cat << EndArrangeScript > arrange_gridsite_test_root.sh 
@@ -43,7 +43,7 @@ echo "Output format:    \$OUTPUT_OPT "
 
 export GSTSTCOLS
 
-${INSTALLCMD} voms-clients httpd mod_ssl curl wget nc lsof $INSTALLPKGS
+${INSTALLCMD} voms-clients curl wget lsof $INSTALLPKGS
 
 HTTPD_CONFDIR=/tmp
 for dir in /etc/httpd /etc/apache /etc/apache2; do