From 239391c98a446647086cb650f95b13184242bfb4 Mon Sep 17 00:00:00 2001 From: gggeek Date: Tue, 7 Dec 2021 12:03:19 +0000 Subject: [PATCH] wip github actions CI --- .github/workflows/ci.yml | 12 ++++++++---- tests/ci/setup/setup_apache.sh | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b65184..b341f68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,16 +69,20 @@ jobs: if: ${{ failure() }} run: | #env - ps auxwww #php -i + #ps auxwww + dpkg --list | grep php + ps auxwww | grep fpm + pwd + sudo env #systemctl status apache2.service #ls -la /etc/apache2/mods-enabled #ls -la /etc/apache2/conf-enabled #ls -la /etc/apache2/mods-available #ls -la /etc/apache2/conf-available - ls -la /etc/apache2/sites-available/ - sudo cat /etc/apache2/envvars - sudo cat /etc/apache2/sites-available/000-default.conf + #ls -la /etc/apache2/sites-available/ + #sudo cat /etc/apache2/envvars + #sudo cat /etc/apache2/sites-available/000-default.conf sudo cat /var/log/privoxy/* sudo cat /var/log/apache2/error.log sudo cat /var/log/apache2/other_vhosts_access.log diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh index b591729..e7930a6 100755 --- a/tests/ci/setup/setup_apache.sh +++ b/tests/ci/setup/setup_apache.sh @@ -23,6 +23,11 @@ rm /etc/apache2/mods-enabled/php* || true cp -f "$SCRIPT_DIR/../config/apache_vhost" /etc/apache2/sites-available/000-default.conf +# 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 "${TRAVIS}" -o -n "${GITHUB_ACTIONS}" ]; then echo "export TESTS_ROOT_DIR=$(pwd)" >> /etc/apache2/envvars else -- 2.43.0