Test if /etc/apache2 is present

Otherwise this check will always fail on non-apache server...
This commit is contained in:
Benoît.S 2017-11-10 11:06:33 +01:00
parent 31518d39b1
commit 85c757d9d4

View file

@ -527,7 +527,7 @@ if [ -e /etc/debian_version ]; then
fi fi
if [ "$IS_APACHE2EVOLINUXCONF" = 1 ]; then if [ "$IS_APACHE2EVOLINUXCONF" = 1 ]; then
if is_debianversion stretch; then if (test -d /etc/apache2 && is_debianversion stretch); then
(test -L /etc/apache2/conf-enabled/z-evolinux-defaults.conf \ (test -L /etc/apache2/conf-enabled/z-evolinux-defaults.conf \
&& test -L /etc/apache2/conf-enabled/zzz-evolinux-custom.conf \ && test -L /etc/apache2/conf-enabled/zzz-evolinux-custom.conf \
&& test -f /etc/apache2/ipaddr_whitelist.conf) || echo 'IS_APACHE2EVOLINUXCONF FAILED!' && test -f /etc/apache2/ipaddr_whitelist.conf) || echo 'IS_APACHE2EVOLINUXCONF FAILED!'