Fix: IS_APACHE_CONFENABLED only when apache2.conf exists.

This commit is contained in:
Benoît S. 2018-07-02 15:41:15 +02:00
parent 7ddb75fb5b
commit 08b5ae0819

View file

@ -802,9 +802,11 @@ if [ -e /etc/debian_version ]; then
# must be replaced by conf-available/ and config files symlinked # must be replaced by conf-available/ and config files symlinked
# to conf-enabled/ # to conf-enabled/
if is_debianversion jessie || is_debianversion stretch; then if is_debianversion jessie || is_debianversion stretch; then
test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!' if [ -f /etc/apache2/apache2.conf ]; then
grep -q 'Include conf.d' /etc/apache2/apache2.conf && \ test -d /etc/apache2/conf.d/ && echo 'IS_APACHE_CONFENABLED FAILED!'
echo 'IS_APACHE_CONFENABLED FAILED!' grep -q 'Include conf.d' /etc/apache2/apache2.conf && \
echo 'IS_APACHE_CONFENABLED FAILED!'
fi
fi fi
fi fi