diff --git a/apache2.changes b/apache2.changes index 6bb1345..85f5847 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 7 15:14:29 UTC 2017 - pgajdos@suse.com + +- start_apache2: include individual sysconfig.d files instead of + sysconfig.d dir, include sysconfig.d/include.conf after httpd.conf + is processed [bsc#1023616] + ------------------------------------------------------------------- Thu Feb 23 14:12:48 UTC 2017 - pgajdos@suse.com diff --git a/start_apache2 b/start_apache2 index d222618..6907c62 100644 --- a/start_apache2 +++ b/start_apache2 @@ -157,9 +157,12 @@ HOME=/var/lib/apache2${instance_suffix} # run Apache # -exec $apache_bin -f $httpd_conf $server_flags \ +exec $apache_bin $server_flags \ -C "PidFile $pid_file" \ - -C "Include $sysconfd_dir" \ + -C "Include $sysconfd_dir/loadmodule.conf" \ + -C "Include $sysconfd_dir/global.conf" \ + -f $httpd_conf \ + -c "Include $sysconfd_dir/include.conf" \ "${sysconfig_setting[@]}" \ $@