diff --git a/apache2.changes b/apache2.changes index 7da864a..468be06 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 1 13:38:05 UTC 2018 - Petr Gajdos + +- consider also patterns in APACHE_CONF_INCLUDE_DIRS as documentation + says (patch Juergen Gleiss) + ------------------------------------------------------------------- Thu Sep 27 10:25:40 UTC 2018 - Petr Gajdos diff --git a/start_apache2 b/start_apache2 index 6907c62..af4dc61 100644 --- a/start_apache2 +++ b/start_apache2 @@ -104,7 +104,7 @@ done # APACHE_CONF_INCLUDE_DIRS -> include.conf for dir in $APACHE_CONF_INCLUDE_DIRS; do test ${dir:0:1} = / || dir=/etc/apache2/$dir - if [ ! -e $dir ]; then + if ! ( [ -e $dir ] || [ -e ${dir%/*} ] ); then continue fi echo "Include $dir" >> ${sysconfd_dir}/include.conf