X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fci%2Fsetup%2Fsetup_apache.sh;h=b29cde2e4c15579a67df5427b1a4b9c88cade65a;hb=c5854380ac66705fa0e42e689cfc078d79a43ade;hp=e7930a6fd7e9de1a24e5589d3b18a9b58444b4af;hpb=239391c98a446647086cb650f95b13184242bfb4;p=plcapi.git

diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh
index e7930a6..b29cde2 100755
--- a/tests/ci/setup/setup_apache.sh
+++ b/tests/ci/setup/setup_apache.sh
@@ -2,7 +2,7 @@
 
 # Install and configure apache2
 # Has to be run as admin
-# @todo make this work across all apache versions (precise to focal)
+# @todo make this work across all ubuntu versions (precise to focal)
 
 set -e
 
@@ -11,11 +11,10 @@ SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
 DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
 
 # set up Apache for php-fpm
-# @see https://github.com/travis-ci/travis-ci.github.com/blob/master/docs/user/languages/php.md#apache--php
 
 a2enmod rewrite proxy_fcgi setenvif ssl
 
-# in case mod-php was enabled (this is the case on at least github's ubuntu with php 5.x and shivammathur/setup-php)
+# in case mod-php was enabled (this is the case at least on GHA's ubuntu with php 5.x and shivammathur/setup-php)
 # @todo silence errors in a smarter way
 rm /etc/apache2/mods-enabled/php* || true
 
@@ -28,7 +27,7 @@ if [ -f /etc/apache2/sites-available/default-ssl.conf ]; then
     rm /etc/apache2/sites-available/default-ssl.conf
 fi
 
-if [ -n "${TRAVIS}" -o -n "${GITHUB_ACTIONS}" ]; then
+if [ -n "${GITHUB_ACTIONS}" ]; then
     echo "export TESTS_ROOT_DIR=$(pwd)" >> /etc/apache2/envvars
 else
     echo "export TESTS_ROOT_DIR=/var/www/html" >> /etc/apache2/envvars