rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 477566 from Apache

Browse Source 
- start_apache2: include individual sysconfig.d files instead of
  sysconfig.d dir, include sysconfig.d/include.conf after httpd.conf
  is processed [bsc#1023616]

OBS-URL: https://build.opensuse.org/request/show/477566
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=131
This commit is contained in:
Dominique Leuenberger 2017-03-10 20:45:08 +00:00 committed by Git OBS Bridge
commit e3bb23eb54
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache2.changes
View File

@ -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

7
start_apache2
View File

@ -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[@]}" \
$@