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

diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh
old mode 100644
new mode 100755
index 781f203..b29cde2
--- a/tests/ci/setup/setup_apache.sh
+++ b/tests/ci/setup/setup_apache.sh
@@ -1,25 +1,33 @@
 #!/bin/sh
 
-set -e
+# Install and configure apache2
+# Has to be run as admin
+# @todo make this work across all ubuntu versions (precise to focal)
 
-# @todo make this work across all apache versions (precise to focal)
+set -e
 
 SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
 
-# install and configure apache2
-
 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 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
+
 # configure apache virtual hosts
 
 cp -f "$SCRIPT_DIR/../config/apache_vhost" /etc/apache2/sites-available/000-default.conf
 
-if [ -n "${TRAVIS}" ]; then
+# default apache siteaccess found in GHA Ubuntu. We remove it just in case
+if [ -f /etc/apache2/sites-available/default-ssl.conf ]; then
+    rm /etc/apache2/sites-available/default-ssl.conf
+fi
+
+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