Commit b4154fb6 authored by Patrick J Cherry's avatar Patrick J Cherry
Browse files

Merge branch 'revert-fix-apache-php7-dist-upgrade' into 'stretch'

Don't force enable PHP7 over PHP5

See merge request open-source/symbiosis!97
parents 58c4d852 9d86cfb3
symbiosis-httpd (2018:0720) stable; urgency=medium
* Revert commit 3dfe596a which enabled Apache PHP7 module by default.
-- Andrew Ladlow <andrew.ladlow@bytemark.co.uk> Fri, 20 Jul 2018 14:07:37 +0100
symbiosis-httpd (2018:0709) stable; urgency=medium
* Allow unrestricted/unredirected access to /.well-known/acme-challenge
......
......@@ -66,17 +66,6 @@ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
apache2_invoke enmod $mod
done
#
# Enable Apache PHP7 module by default
#
if [ -e /etc/apache2/mods-enabled/php5.load ] ; then
echo "I: Disabling PHP 5 module and config"
rm -f /etc/apache2/mods-enabled/php5.conf
rm -f /etc/apache2/mods-enabled/php5.load
echo "I: Enabling PHP 7 module and config"
apache2_invoke enmod php7.0
fi
fi
# change "no-stats" file to "stats" file
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment