X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fci%2Fsetup%2Fsetup_apache.sh;h=366f59ee05a31c1e6bae67edf42d3dadf6e7d016;hb=c7e1bdd8f2a65c45da01bc9acc77857ca412212f;hp=5faee24a0cc7f4e39107d9ff1db3d2ef183d6ebb;hpb=7babc0fc84e8cca70c8cf8d5349ce1dc6cba691e;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 5faee24..366f59e
--- a/tests/ci/setup/setup_apache.sh
+++ b/tests/ci/setup/setup_apache.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-set -e
-
+# Install and configure apache2
+# Has to be run as admin
 # @todo make this work across all apache versions (precise to focal)
 
-SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
+set -e
 
-# install and configure apache2
+SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
 
 DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
 
@@ -15,14 +15,20 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
 
 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)
+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
+if [ -n "${TRAVIS}" -o -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
 fi
+echo "export HTTPSERVER=localhost" >> /etc/apache2/envvars
+
+ls -la /etc/apache2/mods-enabled
 
 service apache2 restart