aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorJunxian.Xiao <Junxian.Xiao@windriver.com>2016-11-10 10:31:42 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2016-11-23 15:24:44 +0100
commitb2409021dd8a3cb7eac8c8ff21d99cbfca6c07c2 (patch)
tree1a7171bdc8de0c658f5b416b15b7215655eab5ed /meta-webserver
parent902a38b9891f5b3358ce5c48ee6b99bddb39d29c (diff)
downloadmeta-openembedded-b2409021dd8a3cb7eac8c8ff21d99cbfca6c07c2.tar.gz
meta-openembedded-b2409021dd8a3cb7eac8c8ff21d99cbfca6c07c2.tar.bz2
meta-openembedded-b2409021dd8a3cb7eac8c8ff21d99cbfca6c07c2.zip
apache2: include .load files in modules.d
According to other Linux distributes like Ubuntu, the modules are usually included by 'LoadModule' command in *.load files in mods-enable directory, as *.conf files in this directory are usually used for special configurations for each module. Include *.load in apache2 top conf file to be compatible with customer's normal usage habits. Signed-off-by: Junxian.Xiao <Junxian.Xiao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb
index 7656595c8..b78ff5163 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb
@@ -81,6 +81,7 @@ do_install_append() {
# Ensure configuration file pulls in conf.d and modules.d
printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
+ printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
# match with that is in init script
printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf