diff --git a/tests/letstest/scripts/test_apache2.sh b/tests/letstest/scripts/test_apache2.sh index 424c839ff..387ceda69 100755 --- a/tests/letstest/scripts/test_apache2.sh +++ b/tests/letstest/scripts/test_apache2.sh @@ -63,11 +63,11 @@ if [ "$OS_TYPE" = "ubuntu" ] ; then MOD_SSL_LOCATION="/usr/lib/apache2/modules/mod_ssl.so" APACHE_NAME=apache2 elif [ "$OS_TYPE" = "centos" ]; then - MOD_SSL_LOCATION="/usr/lib/httpd/modules/mod_ssl.so" + MOD_SSL_LOCATION="/etc/httpd/modules/mod_ssl.so" APACHE_NAME=httpd fi -OPENSSL_VERSION=$(strings "$MOD_SSL_LOCATION" | egrep -o '^OpenSSL ([0-9]\.[^ ]+) ' | tail -c -8) -APACHE_VERSION=$($APACHE_NAME -v | egrep -o 'Apache/([0-9]\.[^ ]+)' | tail -c -7) +OPENSSL_VERSION=$(strings "$MOD_SSL_LOCATION" | egrep -o -m1 '^OpenSSL ([0-9]\.[^ ]+) ' | tail -c +9) +APACHE_VERSION=$($APACHE_NAME -v | egrep -o 'Apache/([0-9]\.[^ ]+)' | tail -c +8) "$PYTHON_NAME" tests/letstest/scripts/test_openssl_version.py "$OPENSSL_VERSION" "$APACHE_VERSION" if [ $? -ne 0 ] ; then FAIL=1