From cc03dc3e81cb9d27b629e92a90400bfcc5f5fb3b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 11 Apr 2012 14:05:11 +0000 Subject: [PATCH] Debian specifics. --- .../gridsite/tests/gridsite-common-testbeds.sh | 13 ++++++++++++- .../gridsite/tests/gridsite-test-all.sh | 2 +- 2 files changed, 13 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 85e0999..4e4ede7 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh @@ -54,7 +54,18 @@ for dir in /etc/httpd /etc/apache /etc/apache2; do 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 +# Debian compress everything inside /usr/share/doc +HTTPD_CONF_SRC=`ls -1 /usr/share/doc/gridsite-*/httpd-webserver.conf* | head -n 1` +if echo \$HTTPD_CONF_SRC | grep '\.gz$' >/dev/null 2>&1; then + gzip -dc < \$HTTPD_CONF_SRC > /tmp/httpd-webserver.conf + HTTPD_CONF_SRC=/tmp/httpd-webserver.conf +fi +if test [ -z "\$HTTPD_CONF_SRC" ]; then + echo "gridsite apache config example not found" >&2 + exit 2 +fi + +sed -e '1,\$s!/usr/lib/httpd/modules/!modules/!' \$HTTPD_CONF_SRC | 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 mkdir -p /var/www/htdocs diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh index f106c69..0ccf266 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh @@ -528,7 +528,7 @@ EOF done printf "Check interpretable DEFVERSION... " - DEFVERSION=`cat /usr/share/doc/gridsite*/VERSION | grep "^DEFVERSION" | head -n 1 | sed 's/DEFVERSION[ \t]*=[ \t]*//'` + DEFVERSION=`cat /usr/share/doc/*gridsite*/VERSION | grep "^DEFVERSION" | head -n 1 | sed 's/DEFVERSION[ \t]*=[ \t]*//'` printf "Oct %o, Hex %x" $DEFVERSION $DEFVERSION if [ $? -eq 0 ]; then test_done -- 1.8.2.3